Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
bug2833
cloud-kernel
提交
d59fdcf2
cloud-kernel
项目概览
bug2833
/
cloud-kernel
与 Fork 源项目一致
Fork自
openanolis / cloud-kernel
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d59fdcf2
编写于
7月 14, 2008
作者:
I
Ingo Molnar
浏览文件
操作
浏览文件
下载
差异文件
Merge commit 'v2.6.26' into x86/core
上级
2387ce57
bce7f793
变更
21
显示空白变更内容
内联
并排
Showing
21 changed file
with
107 addition
and
43 deletion
+107
-43
Documentation/HOWTO
Documentation/HOWTO
+1
-1
MAINTAINERS
MAINTAINERS
+2
-2
Makefile
Makefile
+1
-1
block/bsg.c
block/bsg.c
+2
-1
drivers/char/pcmcia/ipwireless/hardware.c
drivers/char/pcmcia/ipwireless/hardware.c
+3
-1
drivers/isdn/i4l/isdn_common.c
drivers/isdn/i4l/isdn_common.c
+3
-1
drivers/media/video/ov7670.c
drivers/media/video/ov7670.c
+3
-1
drivers/message/fusion/mptbase.c
drivers/message/fusion/mptbase.c
+8
-3
drivers/message/fusion/mptspi.c
drivers/message/fusion/mptspi.c
+7
-2
drivers/rtc/rtc-fm3130.c
drivers/rtc/rtc-fm3130.c
+1
-1
drivers/rtc/rtc-pcf8563.c
drivers/rtc/rtc-pcf8563.c
+1
-0
drivers/scsi/ipr.c
drivers/scsi/ipr.c
+5
-1
drivers/scsi/scsi_lib.c
drivers/scsi/scsi_lib.c
+9
-0
drivers/serial/8250.c
drivers/serial/8250.c
+3
-0
drivers/video/fb_defio.c
drivers/video/fb_defio.c
+19
-1
fs/cifs/cifsacl.c
fs/cifs/cifsacl.c
+5
-5
fs/cifs/inode.c
fs/cifs/inode.c
+10
-10
include/asm-frv/system.h
include/asm-frv/system.h
+1
-1
include/asm-x86/desc.h
include/asm-x86/desc.h
+2
-2
kernel/cpuset.c
kernel/cpuset.c
+18
-6
security/device_cgroup.c
security/device_cgroup.c
+3
-3
未找到文件。
Documentation/HOWTO
浏览文件 @
d59fdcf2
...
...
@@ -377,7 +377,7 @@ Bug Reporting
bugzilla.kernel.org is where the Linux kernel developers track kernel
bugs. Users are encouraged to report all bugs that they find in this
tool. For details on how to use the kernel bugzilla, please see:
http://
test.kernel.org/bugzilla/
faq.html
http://
bugzilla.kernel.org/page.cgi?id=
faq.html
The file REPORTING-BUGS in the main kernel source directory has a good
template for how to report a possible kernel bug, and details what kind
...
...
MAINTAINERS
浏览文件 @
d59fdcf2
...
...
@@ -3088,8 +3088,8 @@ L: linux-scsi@vger.kernel.org
S: Maintained
OPROFILE
P:
Philippe Elie
M:
phil.el@wanadoo.fr
P:
Robert Richter
M:
robert.richter@amd.com
L: oprofile-list@lists.sf.net
S: Maintained
...
...
Makefile
浏览文件 @
d59fdcf2
VERSION
=
2
PATCHLEVEL
=
6
SUBLEVEL
=
26
EXTRAVERSION
=
-rc9
EXTRAVERSION
=
NAME
=
Rotary Wombat
# *DOCUMENTATION*
...
...
block/bsg.c
浏览文件 @
d59fdcf2
...
...
@@ -709,11 +709,12 @@ static void bsg_kref_release_function(struct kref *kref)
{
struct
bsg_class_device
*
bcd
=
container_of
(
kref
,
struct
bsg_class_device
,
ref
);
struct
device
*
parent
=
bcd
->
parent
;
if
(
bcd
->
release
)
bcd
->
release
(
bcd
->
parent
);
put_device
(
bcd
->
parent
);
put_device
(
parent
);
}
static
int
bsg_put_device
(
struct
bsg_device
*
bd
)
...
...
drivers/char/pcmcia/ipwireless/hardware.c
浏览文件 @
d59fdcf2
...
...
@@ -590,8 +590,10 @@ static struct ipw_rx_packet *pool_allocate(struct ipw_hardware *hw,
packet
=
kmalloc
(
sizeof
(
struct
ipw_rx_packet
)
+
old_packet
->
length
+
minimum_free_space
,
GFP_ATOMIC
);
if
(
!
packet
)
if
(
!
packet
)
{
kfree
(
old_packet
);
return
NULL
;
}
memcpy
(
packet
,
old_packet
,
sizeof
(
struct
ipw_rx_packet
)
+
old_packet
->
length
);
...
...
drivers/isdn/i4l/isdn_common.c
浏览文件 @
d59fdcf2
...
...
@@ -1977,8 +1977,10 @@ isdn_writebuf_stub(int drvidx, int chan, const u_char __user * buf, int len)
if
(
!
skb
)
return
-
ENOMEM
;
skb_reserve
(
skb
,
hl
);
if
(
copy_from_user
(
skb_put
(
skb
,
len
),
buf
,
len
))
if
(
copy_from_user
(
skb_put
(
skb
,
len
),
buf
,
len
))
{
dev_kfree_skb
(
skb
);
return
-
EFAULT
;
}
ret
=
dev
->
drv
[
drvidx
]
->
interface
->
writebuf_skb
(
drvidx
,
chan
,
1
,
skb
);
if
(
ret
<=
0
)
dev_kfree_skb
(
skb
);
...
...
drivers/media/video/ov7670.c
浏览文件 @
d59fdcf2
...
...
@@ -406,8 +406,10 @@ static int ov7670_read(struct i2c_client *c, unsigned char reg,
int
ret
;
ret
=
i2c_smbus_read_byte_data
(
c
,
reg
);
if
(
ret
>=
0
)
if
(
ret
>=
0
)
{
*
value
=
(
unsigned
char
)
ret
;
ret
=
0
;
}
return
ret
;
}
...
...
drivers/message/fusion/mptbase.c
浏览文件 @
d59fdcf2
...
...
@@ -1686,9 +1686,14 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
ioc
->
bus_type
=
SAS
;
}
if
(
ioc
->
bus_type
==
SAS
&&
mpt_msi_enable
==
-
1
)
if
(
mpt_msi_enable
==
-
1
)
{
/* Enable on SAS, disable on FC and SPI */
if
(
ioc
->
bus_type
==
SAS
)
ioc
->
msi_enable
=
1
;
else
ioc
->
msi_enable
=
0
;
}
else
/* follow flag: 0 - disable; 1 - enable */
ioc
->
msi_enable
=
mpt_msi_enable
;
if
(
ioc
->
errata_flag_1064
)
...
...
drivers/message/fusion/mptspi.c
浏览文件 @
d59fdcf2
...
...
@@ -1266,13 +1266,18 @@ mptspi_dv_renegotiate(struct _MPT_SCSI_HOST *hd)
static
int
mptspi_ioc_reset
(
MPT_ADAPTER
*
ioc
,
int
reset_phase
)
{
struct
_MPT_SCSI_HOST
*
hd
=
shost_priv
(
ioc
->
sh
);
int
rc
;
rc
=
mptscsih_ioc_reset
(
ioc
,
reset_phase
);
if
(
reset_phase
==
MPT_IOC_POST_RESET
)
/* only try to do a renegotiation if we're properly set up
* if we get an ioc fault on bringup, ioc->sh will be NULL */
if
(
reset_phase
==
MPT_IOC_POST_RESET
&&
ioc
->
sh
)
{
struct
_MPT_SCSI_HOST
*
hd
=
shost_priv
(
ioc
->
sh
);
mptspi_dv_renegotiate
(
hd
);
}
return
rc
;
}
...
...
drivers/rtc/rtc-fm3130.c
浏览文件 @
d59fdcf2
...
...
@@ -55,7 +55,7 @@ struct fm3130 {
int
alarm
;
};
static
const
struct
i2c_device_id
fm3130_id
[]
=
{
{
"fm3130
-rtc
"
,
0
},
{
"fm3130"
,
0
},
{
}
};
MODULE_DEVICE_TABLE
(
i2c
,
fm3130_id
);
...
...
drivers/rtc/rtc-pcf8563.c
浏览文件 @
d59fdcf2
...
...
@@ -302,6 +302,7 @@ static int pcf8563_remove(struct i2c_client *client)
static
const
struct
i2c_device_id
pcf8563_id
[]
=
{
{
"pcf8563"
,
0
},
{
"rtc8564"
,
0
},
{
}
};
MODULE_DEVICE_TABLE
(
i2c
,
pcf8563_id
);
...
...
drivers/scsi/ipr.c
浏览文件 @
d59fdcf2
...
...
@@ -71,6 +71,7 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/libata.h>
#include <linux/hdreg.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/processor.h>
...
...
@@ -4913,8 +4914,11 @@ static int ipr_ioctl(struct scsi_device *sdev, int cmd, void __user *arg)
struct
ipr_resource_entry
*
res
;
res
=
(
struct
ipr_resource_entry
*
)
sdev
->
hostdata
;
if
(
res
&&
ipr_is_gata
(
res
))
if
(
res
&&
ipr_is_gata
(
res
))
{
if
(
cmd
==
HDIO_GET_IDENTITY
)
return
-
ENOTTY
;
return
ata_scsi_ioctl
(
sdev
,
cmd
,
arg
);
}
return
-
EINVAL
;
}
...
...
drivers/scsi/scsi_lib.c
浏览文件 @
d59fdcf2
...
...
@@ -207,6 +207,15 @@ int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
*/
blk_execute_rq
(
req
->
q
,
NULL
,
req
,
1
);
/*
* Some devices (USB mass-storage in particular) may transfer
* garbage data together with a residue indicating that the data
* is invalid. Prevent the garbage from being misinterpreted
* and prevent security leaks by zeroing out the excess data.
*/
if
(
unlikely
(
req
->
data_len
>
0
&&
req
->
data_len
<=
bufflen
))
memset
(
buffer
+
(
bufflen
-
req
->
data_len
),
0
,
req
->
data_len
);
ret
=
req
->
errors
;
out:
blk_put_request
(
req
);
...
...
drivers/serial/8250.c
浏览文件 @
d59fdcf2
...
...
@@ -2623,6 +2623,9 @@ static struct console serial8250_console = {
static
int
__init
serial8250_console_init
(
void
)
{
if
(
nr_uarts
>
UART_NR
)
nr_uarts
=
UART_NR
;
serial8250_isa_init_ports
();
register_console
(
&
serial8250_console
);
return
0
;
...
...
drivers/video/fb_defio.c
浏览文件 @
d59fdcf2
...
...
@@ -74,6 +74,7 @@ static int fb_deferred_io_mkwrite(struct vm_area_struct *vma,
{
struct
fb_info
*
info
=
vma
->
vm_private_data
;
struct
fb_deferred_io
*
fbdefio
=
info
->
fbdefio
;
struct
page
*
cur
;
/* this is a callback we get when userspace first tries to
write to the page. we schedule a workqueue. that workqueue
...
...
@@ -83,7 +84,24 @@ static int fb_deferred_io_mkwrite(struct vm_area_struct *vma,
/* protect against the workqueue changing the page list */
mutex_lock
(
&
fbdefio
->
lock
);
list_add
(
&
page
->
lru
,
&
fbdefio
->
pagelist
);
/* we loop through the pagelist before adding in order
to keep the pagelist sorted */
list_for_each_entry
(
cur
,
&
fbdefio
->
pagelist
,
lru
)
{
/* this check is to catch the case where a new
process could start writing to the same page
through a new pte. this new access can cause the
mkwrite even when the original ps's pte is marked
writable */
if
(
unlikely
(
cur
==
page
))
goto
page_already_added
;
else
if
(
cur
->
index
>
page
->
index
)
break
;
}
list_add_tail
(
&
page
->
lru
,
&
cur
->
lru
);
page_already_added:
mutex_unlock
(
&
fbdefio
->
lock
);
/* come back after delay to process the deferred IO */
...
...
fs/cifs/cifsacl.c
浏览文件 @
d59fdcf2
...
...
@@ -34,11 +34,11 @@
static
struct
cifs_wksid
wksidarr
[
NUM_WK_SIDS
]
=
{
{{
1
,
0
,
{
0
,
0
,
0
,
0
,
0
,
0
},
{
0
,
0
,
0
,
0
,
0
}
},
"null user"
},
{{
1
,
1
,
{
0
,
0
,
0
,
0
,
0
,
1
},
{
0
,
0
,
0
,
0
,
0
}
},
"nobody"
},
{{
1
,
1
,
{
0
,
0
,
0
,
0
,
0
,
5
},
{
cpu_to_le32
(
11
),
0
,
0
,
0
,
0
}
},
"net-users"
},
{{
1
,
1
,
{
0
,
0
,
0
,
0
,
0
,
5
},
{
cpu_to_le32
(
18
),
0
,
0
,
0
,
0
}
},
"sys"
},
{{
1
,
2
,
{
0
,
0
,
0
,
0
,
0
,
5
},
{
cpu_to_le32
(
32
),
cpu_to_le32
(
544
),
0
,
0
,
0
}
},
"root"
},
{{
1
,
2
,
{
0
,
0
,
0
,
0
,
0
,
5
},
{
cpu_to_le32
(
32
),
cpu_to_le32
(
545
),
0
,
0
,
0
}
},
"users"
},
{{
1
,
2
,
{
0
,
0
,
0
,
0
,
0
,
5
},
{
cpu_to_le32
(
32
),
cpu_to_le32
(
546
),
0
,
0
,
0
}
},
"guest"
}
}
{{
1
,
1
,
{
0
,
0
,
0
,
0
,
0
,
5
},
{
__constant_
cpu_to_le32
(
11
),
0
,
0
,
0
,
0
}
},
"net-users"
},
{{
1
,
1
,
{
0
,
0
,
0
,
0
,
0
,
5
},
{
__constant_
cpu_to_le32
(
18
),
0
,
0
,
0
,
0
}
},
"sys"
},
{{
1
,
2
,
{
0
,
0
,
0
,
0
,
0
,
5
},
{
__constant_cpu_to_le32
(
32
),
__constant_
cpu_to_le32
(
544
),
0
,
0
,
0
}
},
"root"
},
{{
1
,
2
,
{
0
,
0
,
0
,
0
,
0
,
5
},
{
__constant_cpu_to_le32
(
32
),
__constant_
cpu_to_le32
(
545
),
0
,
0
,
0
}
},
"users"
},
{{
1
,
2
,
{
0
,
0
,
0
,
0
,
0
,
5
},
{
__constant_cpu_to_le32
(
32
),
__constant_
cpu_to_le32
(
546
),
0
,
0
,
0
}
},
"guest"
}
}
;
...
...
fs/cifs/inode.c
浏览文件 @
d59fdcf2
...
...
@@ -219,15 +219,15 @@ int cifs_get_inode_info_unix(struct inode **pinode,
rc
=
CIFSSMBUnixQPathInfo
(
xid
,
pTcon
,
full_path
,
&
find_data
,
cifs_sb
->
local_nls
,
cifs_sb
->
mnt_cifs_flags
&
CIFS_MOUNT_MAP_SPECIAL_CHR
);
if
(
rc
)
{
if
(
rc
==
-
EREMOTE
&&
!
is_dfs_referral
)
{
is_dfs_referral
=
true
;
cFYI
(
DBG2
,
(
"DFS ref"
));
/* for DFS, server does not give us real inode data */
fill_fake_finddataunix
(
&
find_data
,
sb
);
rc
=
0
;
}
}
}
else
if
(
rc
)
goto
cgiiu_exit
;
num_of_bytes
=
le64_to_cpu
(
find_data
.
NumOfBytes
);
end_of_file
=
le64_to_cpu
(
find_data
.
EndOfFile
);
...
...
include/asm-frv/system.h
浏览文件 @
d59fdcf2
...
...
@@ -87,7 +87,7 @@ do { \
} while(0)
#define irqs_disabled() \
({unsigned long flags; local_save_flags(flags); flags; })
({unsigned long flags; local_save_flags(flags);
!!
flags; })
#define local_irq_save(flags) \
do { \
...
...
include/asm-x86/desc.h
浏览文件 @
d59fdcf2
...
...
@@ -188,8 +188,8 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
unsigned
cpu
=
smp_processor_id
();
ldt_desc
ldt
;
set_tssldt_descriptor
(
&
ldt
,
(
unsigned
long
)
addr
,
DESC_LDT
,
entries
*
sizeof
(
ldt
)
-
1
);
set_tssldt_descriptor
(
&
ldt
,
(
unsigned
long
)
addr
,
DESC_LDT
,
entries
*
LDT_ENTRY_SIZE
-
1
);
write_gdt_entry
(
get_cpu_gdt_table
(
cpu
),
GDT_ENTRY_LDT
,
&
ldt
,
DESC_LDT
);
asm
volatile
(
"lldt %w0"
::
"q"
(
GDT_ENTRY_LDT
*
8
));
...
...
kernel/cpuset.c
浏览文件 @
d59fdcf2
...
...
@@ -1882,7 +1882,7 @@ static void scan_for_empty_cpusets(const struct cpuset *root)
* in order to minimize text size.
*/
static
void
common_cpu_mem_hotplug_unplug
(
voi
d
)
static
void
common_cpu_mem_hotplug_unplug
(
int
rebuild_s
d
)
{
cgroup_lock
();
...
...
@@ -1894,6 +1894,7 @@ static void common_cpu_mem_hotplug_unplug(void)
* Scheduler destroys domains on hotplug events.
* Rebuild them based on the current settings.
*/
if
(
rebuild_sd
)
rebuild_sched_domains
();
cgroup_unlock
();
...
...
@@ -1912,11 +1913,22 @@ static void common_cpu_mem_hotplug_unplug(void)
static
int
cpuset_handle_cpuhp
(
struct
notifier_block
*
unused_nb
,
unsigned
long
phase
,
void
*
unused_cpu
)
{
if
(
phase
==
CPU_DYING
||
phase
==
CPU_DYING_FROZEN
)
switch
(
phase
)
{
case
CPU_UP_CANCELED
:
case
CPU_UP_CANCELED_FROZEN
:
case
CPU_DOWN_FAILED
:
case
CPU_DOWN_FAILED_FROZEN
:
case
CPU_ONLINE
:
case
CPU_ONLINE_FROZEN
:
case
CPU_DEAD
:
case
CPU_DEAD_FROZEN
:
common_cpu_mem_hotplug_unplug
(
1
);
break
;
default:
return
NOTIFY_DONE
;
}
common_cpu_mem_hotplug_unplug
();
return
0
;
return
NOTIFY_OK
;
}
#ifdef CONFIG_MEMORY_HOTPLUG
...
...
@@ -1929,7 +1941,7 @@ static int cpuset_handle_cpuhp(struct notifier_block *unused_nb,
void
cpuset_track_online_nodes
(
void
)
{
common_cpu_mem_hotplug_unplug
();
common_cpu_mem_hotplug_unplug
(
0
);
}
#endif
...
...
security/device_cgroup.c
浏览文件 @
d59fdcf2
...
...
@@ -222,7 +222,7 @@ static void devcgroup_destroy(struct cgroup_subsys *ss,
#define DEVCG_DENY 2
#define DEVCG_LIST 3
#define MAJMINLEN 1
0
#define MAJMINLEN 1
3
#define ACCLEN 4
static
void
set_access
(
char
*
acc
,
short
access
)
...
...
@@ -254,7 +254,7 @@ static void set_majmin(char *str, unsigned m)
if
(
m
==
~
0
)
sprintf
(
str
,
"*"
);
else
snprintf
(
str
,
MAJMINLEN
,
"%
d
"
,
m
);
snprintf
(
str
,
MAJMINLEN
,
"%
u
"
,
m
);
}
static
int
devcgroup_seq_read
(
struct
cgroup
*
cgroup
,
struct
cftype
*
cft
,
...
...
@@ -300,7 +300,7 @@ static int may_access_whitelist(struct dev_cgroup *c,
continue
;
if
(
whitem
->
minor
!=
~
0
&&
whitem
->
minor
!=
refwh
->
minor
)
continue
;
if
(
refwh
->
access
&
(
~
(
whitem
->
access
|
ACC_MASK
)
))
if
(
refwh
->
access
&
(
~
whitem
->
access
))
continue
;
return
1
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录