Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FengXiao2002
Linux Imx
提交
ae2c27a7
L
Linux Imx
项目概览
FengXiao2002
/
Linux Imx
通知
8
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
Linux Imx
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ae2c27a7
编写于
2月 02, 2007
作者:
J
Jeff Garzik
浏览文件
操作
浏览文件
下载
差异文件
Merge ../linux-2.6
上级
a608ab9c
e34efe3b
变更
30
隐藏空白更改
内联
并排
Showing
30 changed file
with
154 addition
and
104 deletion
+154
-104
Documentation/sysrq.txt
Documentation/sysrq.txt
+35
-31
MAINTAINERS
MAINTAINERS
+1
-7
arch/i386/boot/compressed/relocs.c
arch/i386/boot/compressed/relocs.c
+2
-0
arch/i386/mach-default/setup.c
arch/i386/mach-default/setup.c
+1
-1
arch/sparc/kernel/smp.c
arch/sparc/kernel/smp.c
+4
-4
arch/sparc/kernel/sun4d_smp.c
arch/sparc/kernel/sun4d_smp.c
+1
-1
drivers/char/sysrq.c
drivers/char/sysrq.c
+11
-9
drivers/ide/ide.c
drivers/ide/ide.c
+4
-4
drivers/ide/pci/via82cxxx.c
drivers/ide/pci/via82cxxx.c
+1
-1
drivers/kvm/vmx.c
drivers/kvm/vmx.c
+2
-0
drivers/net/hamradio/Kconfig
drivers/net/hamradio/Kconfig
+3
-3
drivers/pci/quirks.c
drivers/pci/quirks.c
+5
-3
drivers/pci/search.c
drivers/pci/search.c
+2
-8
fs/nfsd/nfsfh.c
fs/nfsd/nfsfh.c
+1
-1
fs/proc/base.c
fs/proc/base.c
+11
-1
include/asm-frv/Kbuild
include/asm-frv/Kbuild
+6
-0
include/asm-frv/page.h
include/asm-frv/page.h
+2
-2
include/asm-frv/ptrace.h
include/asm-frv/ptrace.h
+4
-0
include/asm-frv/termios.h
include/asm-frv/termios.h
+2
-0
include/asm-um/pgtable.h
include/asm-um/pgtable.h
+9
-0
include/linux/efi.h
include/linux/efi.h
+1
-1
kernel/fork.c
kernel/fork.c
+1
-1
mm/page_alloc.c
mm/page_alloc.c
+1
-2
net/ipv4/netfilter/ip_conntrack_sip.c
net/ipv4/netfilter/ip_conntrack_sip.c
+8
-2
net/ipv6/addrconf.c
net/ipv6/addrconf.c
+2
-2
net/ipv6/ndisc.c
net/ipv6/ndisc.c
+7
-0
net/netfilter/Kconfig
net/netfilter/Kconfig
+1
-1
net/netfilter/nf_conntrack_sip.c
net/netfilter/nf_conntrack_sip.c
+8
-2
net/netfilter/xt_connbytes.c
net/netfilter/xt_connbytes.c
+12
-17
net/sctp/sm_sideeffect.c
net/sctp/sm_sideeffect.c
+6
-0
未找到文件。
Documentation/sysrq.txt
浏览文件 @
ae2c27a7
Linux Magic System Request Key Hacks
Documentation for sysrq.c
version 1.15
Last update:
$Date: 2001/01/28 10:15:59 $
Documentation for sysrq.c
Last update:
2007-JAN-06
* What is the magic SysRq key?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
...
...
@@ -35,7 +35,7 @@ You can set the value in the file by the following command:
Note that the value of /proc/sys/kernel/sysrq influences only the invocation
via a keyboard. Invocation of any operation via /proc/sysrq-trigger is always
allowed.
allowed
(by a user with admin privileges)
.
* How do I use the magic SysRq key?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
...
...
@@ -58,7 +58,7 @@ On PowerPC - Press 'ALT - Print Screen (or F13) - <command key>,
On other - If you know of the key combos for other architectures, please
let me know so I can add them to this section.
On all - write a character to /proc/sysrq-trigger. e
g
:
On all - write a character to /proc/sysrq-trigger. e
.g.
:
echo t > /proc/sysrq-trigger
...
...
@@ -74,6 +74,8 @@ On all - write a character to /proc/sysrq-trigger. eg:
'c' - Will perform a kexec reboot in order to take a crashdump.
'd' - Shows all locks that are held.
'o' - Will shut your system off (if configured and supported).
's' - Will attempt to sync all mounted filesystems.
...
...
@@ -87,38 +89,43 @@ On all - write a character to /proc/sysrq-trigger. eg:
'm' - Will dump current memory info to your console.
'n' - Used to make RT tasks nice-able
'v' - Dumps Voyager SMP processor info to your console.
'w' - Dumps tasks that are in uninterruptable (blocked) state.
'x' - Used by xmon interface on ppc/powerpc platforms.
'0'-'9' - Sets the console log level, controlling which kernel messages
will be printed to your console. ('0', for example would make
it so that only emergency messages like PANICs or OOPSes would
make it to your console.)
'f' - Will call oom_kill to kill a memory hog process
'f' - Will call oom_kill to kill a memory hog process
.
'e' - Send a SIGTERM to all processes, except for init.
'
i' - Send a SIGKILL to all processes, except for init
.
'
g' - Used by kgdb on ppc platforms
.
'l' - Send a SIGKILL to all processes, INCLUDING init. (Your system
will be non-functional after this.)
'i' - Send a SIGKILL to all processes, except for init.
'h' - Will display help (
actually any other key than those listed
'h' - Will display help (actually any other key than those listed
above will display help. but 'h' is easy to remember :-)
* Okay, so what can I use them for?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Well, un'R'aw is very handy when your X server or a svgalib program crashes.
sa'K' (Secure Access Key) is useful when you want to be sure there
are
no
trojan program
is running at console and
which could grab your password
when you would try to login. It will kill all programs on given console
and
thus letting you make sure that the login prompt you see is actually
sa'K' (Secure Access Key) is useful when you want to be sure there
is
no
trojan program
running at console
which could grab your password
when you would try to login. It will kill all programs on given console
,
thus letting you make sure that the login prompt you see is actually
the one from init, not some trojan program.
IMPORTANT: In its true form it is not a true SAK like the one in a :IMPORTANT
IMPORTANT: c2 compliant system, and it should not be mistaken as :IMPORTANT
IMPORTANT: such. :IMPORTANT
It seems other find it useful as (System Attention Key) which is
It seems other
s
find it useful as (System Attention Key) which is
useful when you want to exit a program that will not let you switch consoles.
(For example, X or a svgalib program.)
...
...
@@ -139,8 +146,8 @@ OK or Done message...)
Again, the unmount (remount read-only) hasn't taken place until you see the
"OK" and "Done" message appear on the screen.
The loglevel
'0'-'9' is
useful when your console is being flooded with
kernel messages you do not want to see. Se
t
ting '0' will prevent all but
The loglevel
s '0'-'9' are
useful when your console is being flooded with
kernel messages you do not want to see. Se
lec
ting '0' will prevent all but
the most urgent kernel messages from reaching your console. (They will
still be logged if syslogd/klogd are alive, though.)
...
...
@@ -152,7 +159,7 @@ processes.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
That happens to me, also. I've found that tapping shift, alt, and control
on both sides of the keyboard, and hitting an invalid sysrq sequence again
will fix the problem. (i
e
, something like alt-sysrq-z). Switching to another
will fix the problem. (i
.e.
, something like alt-sysrq-z). Switching to another
virtual console (ALT+Fn) and then back again should also help.
* I hit SysRq, but nothing seems to happen, what's wrong?
...
...
@@ -174,11 +181,11 @@ handler function you will use, B) a help_msg string, that will print when SysRQ
prints help, and C) an action_msg string, that will print right before your
handler is called. Your handler must conform to the prototype in 'sysrq.h'.
After the sysrq_key_op is created, you can call the
macro
register_sysrq_key(int key, struct sysrq_key_op *op_p)
that is defined in
sysrq.h, this will register the operation pointed to by 'op_p' at table
key 'key', if that slot in the table is blank. At module unload time, you must
call the macro
unregister_sysrq_key(int key, struct sysrq_key_op *op_p), which
After the sysrq_key_op is created, you can call the
kernel function
register_sysrq_key(int key, struct sysrq_key_op *op_p)
; this will
register the operation pointed to by 'op_p' at table key 'key',
if that slot in the table is blank. At module unload time, you must call
the function
unregister_sysrq_key(int key, struct sysrq_key_op *op_p), which
will remove the key op pointed to by 'op_p' from the key 'key', if and only if
it is currently registered in that slot. This is in case the slot has been
overwritten since you registered it.
...
...
@@ -186,15 +193,12 @@ overwritten since you registered it.
The Magic SysRQ system works by registering key operations against a key op
lookup table, which is defined in 'drivers/char/sysrq.c'. This key table has
a number of operations registered into it at compile time, but is mutable,
and 4 functions are exported for interface to it: __sysrq_lock_table,
__sysrq_unlock_table, __sysrq_get_key_op, and __sysrq_put_key_op. The
functions __sysrq_swap_key_ops and __sysrq_swap_key_ops_nolock are defined
in the header itself, and the REGISTER and UNREGISTER macros are built from
these. More complex (and dangerous!) manipulations of the table are possible
using these functions, but you must be careful to always lock the table before
you read or write from it, and to unlock it again when you are done. (And of
course, to never ever leave an invalid pointer in the table). Null pointers in
the table are always safe :)
and 2 functions are exported for interface to it:
register_sysrq_key and unregister_sysrq_key.
Of course, never ever leave an invalid pointer in the table. I.e., when
your module that called register_sysrq_key() exits, it must call
unregister_sysrq_key() to clean up the sysrq key table entry that it used.
Null pointers in the table are always safe. :)
If for some reason you feel the need to call the handle_sysrq function from
within a function called by handle_sysrq, you must be aware that you are in
...
...
MAINTAINERS
浏览文件 @
ae2c27a7
...
...
@@ -598,8 +598,6 @@ W: http://linux-atm.sourceforge.net
S: Maintained
ATMEL MACB ETHERNET DRIVER
P: Atmel AVR32 Support Team
M: avr32@atmel.com
P: Haavard Skinnemoen
M: hskinnemoen@atmel.com
S: Supported
...
...
@@ -620,8 +618,6 @@ T: git kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6.git
S: Maintained
AVR32 ARCHITECTURE
P: Atmel AVR32 Support Team
M: avr32@atmel.com
P: Haavard Skinnemoen
M: hskinnemoen@atmel.com
W: http://www.atmel.com/products/AVR32/
...
...
@@ -630,8 +626,6 @@ W: http://avrfreaks.net/
S: Supported
AVR32/AT32AP MACHINE SUPPORT
P: Atmel AVR32 Support Team
M: avr32@atmel.com
P: Haavard Skinnemoen
M: hskinnemoen@atmel.com
S: Supported
...
...
@@ -2288,7 +2282,7 @@ P: Jozsef Kadlecsik
P: Patrick McHardy
M: kaber@trash.net
L: netfilter-devel@lists.netfilter.org
L: netfilter@lists.netfilter.org
L: netfilter@lists.netfilter.org
(subscribers-only)
L: coreteam@netfilter.org
W: http://www.netfilter.org/
W: http://www.iptables.org/
...
...
arch/i386/boot/compressed/relocs.c
浏览文件 @
ae2c27a7
...
...
@@ -43,6 +43,8 @@ static int is_safe_abs_reloc(const char* sym_name)
/* Match found */
return
1
;
}
if
(
strncmp
(
sym_name
,
"__crc_"
,
6
)
==
0
)
return
1
;
return
0
;
}
...
...
arch/i386/mach-default/setup.c
浏览文件 @
ae2c27a7
...
...
@@ -102,7 +102,7 @@ void __init time_init_hook(void)
* along the MCA bus. Use this to hook into that chain if you will need
* it.
**/
void
__init
mca_nmi_hook
(
void
)
void
mca_nmi_hook
(
void
)
{
/* If I recall correctly, there's a whole bunch of other things that
* we can do to check for NMI problems, but that's all I know about
...
...
arch/sparc/kernel/smp.c
浏览文件 @
ae2c27a7
...
...
@@ -292,8 +292,8 @@ int setup_profiling_timer(unsigned int multiplier)
void
__init
smp_prepare_cpus
(
unsigned
int
max_cpus
)
{
extern
void
smp4m_boot_cpus
(
void
);
extern
void
smp4d_boot_cpus
(
void
);
extern
void
__init
smp4m_boot_cpus
(
void
);
extern
void
__init
smp4d_boot_cpus
(
void
);
int
i
,
cpuid
,
extra
;
printk
(
"Entering SMP Mode...
\n
"
);
...
...
@@ -375,8 +375,8 @@ void __init smp_prepare_boot_cpu(void)
int
__cpuinit
__cpu_up
(
unsigned
int
cpu
)
{
extern
int
smp4m_boot_one_cpu
(
int
);
extern
int
smp4d_boot_one_cpu
(
int
);
extern
int
__cpuinit
smp4m_boot_one_cpu
(
int
);
extern
int
__cpuinit
smp4d_boot_one_cpu
(
int
);
int
ret
=
0
;
switch
(
sparc_cpu_model
)
{
...
...
arch/sparc/kernel/sun4d_smp.c
浏览文件 @
ae2c27a7
...
...
@@ -164,7 +164,7 @@ void __init smp4d_boot_cpus(void)
local_flush_cache_all
();
}
int
smp4d_boot_one_cpu
(
int
i
)
int
__cpuinit
smp4d_boot_one_cpu
(
int
i
)
{
extern
unsigned
long
sun4d_cpu_startup
;
unsigned
long
*
entry
=
&
sun4d_cpu_startup
;
...
...
drivers/char/sysrq.c
浏览文件 @
ae2c27a7
...
...
@@ -215,7 +215,7 @@ static void sysrq_handle_showstate_blocked(int key, struct tty_struct *tty)
}
static
struct
sysrq_key_op
sysrq_showstate_blocked_op
=
{
.
handler
=
sysrq_handle_showstate_blocked
,
.
help_msg
=
"sho
wBlockedT
asks"
,
.
help_msg
=
"sho
W-blocked-t
asks"
,
.
action_msg
=
"Show Blocked State"
,
.
enable_mask
=
SYSRQ_ENABLE_DUMP
,
};
...
...
@@ -315,15 +315,16 @@ static struct sysrq_key_op *sysrq_key_table[36] = {
&
sysrq_loglevel_op
,
/* 9 */
/*
* Don't use for system provided sysrqs, it is handled specially on
* sparc and will never arrive
*
a:
Don't use for system provided sysrqs, it is handled specially on
* sparc and will never arrive
.
*/
NULL
,
/* a */
&
sysrq_reboot_op
,
/* b */
&
sysrq_crashdump_op
,
/* c */
&
sysrq_crashdump_op
,
/* c
& ibm_emac driver debug
*/
&
sysrq_showlocks_op
,
/* d */
&
sysrq_term_op
,
/* e */
&
sysrq_moom_op
,
/* f */
/* g: May be registered by ppc for kgdb */
NULL
,
/* g */
NULL
,
/* h */
&
sysrq_kill_op
,
/* i */
...
...
@@ -332,18 +333,19 @@ static struct sysrq_key_op *sysrq_key_table[36] = {
NULL
,
/* l */
&
sysrq_showmem_op
,
/* m */
&
sysrq_unrt_op
,
/* n */
/* This will often be registered as 'Off' at init time */
/*
o:
This will often be registered as 'Off' at init time */
NULL
,
/* o */
&
sysrq_showregs_op
,
/* p */
NULL
,
/* q */
&
sysrq_unraw_op
,
/* r */
&
sysrq_unraw_op
,
/* r */
&
sysrq_sync_op
,
/* s */
&
sysrq_showstate_op
,
/* t */
&
sysrq_mountro_op
,
/* u */
/*
May be assign
ed at init time by SMP VOYAGER */
/*
v: May be register
ed at init time by SMP VOYAGER */
NULL
,
/* v */
NULL
,
/* w */
&
sysrq_showstate_blocked_op
,
/* x */
&
sysrq_showstate_blocked_op
,
/* w */
/* x: May be registered on ppc/powerpc for xmon */
NULL
,
/* x */
NULL
,
/* y */
NULL
/* z */
};
...
...
drivers/ide/ide.c
浏览文件 @
ae2c27a7
...
...
@@ -1781,9 +1781,9 @@ done:
return
1
;
}
extern
void
pnpide_init
(
void
);
extern
void
pnpide_exit
(
void
);
extern
void
h8300_ide_init
(
void
);
extern
void
__init
pnpide_init
(
void
);
extern
void
__exit
pnpide_exit
(
void
);
extern
void
__init
h8300_ide_init
(
void
);
/*
* probe_for_hwifs() finds/initializes "known" IDE interfaces
...
...
@@ -2088,7 +2088,7 @@ int __init init_module (void)
return
ide_init
();
}
void
cleanup_module
(
void
)
void
__exit
cleanup_module
(
void
)
{
int
index
;
...
...
drivers/ide/pci/via82cxxx.c
浏览文件 @
ae2c27a7
...
...
@@ -78,7 +78,7 @@ static struct via_isa_bridge {
u8
rev_max
;
u16
flags
;
}
via_isa_bridges
[]
=
{
{
"cx700
0"
,
PCI_DEVICE_ID_VIA_CX700
,
0x00
,
0x2f
,
VIA_UDMA_133
|
VIA_BAD_AST
},
{
"cx700
"
,
PCI_DEVICE_ID_VIA_CX700
,
0x00
,
0x2f
,
VIA_UDMA_133
|
VIA_BAD_AST
},
{
"vt8237s"
,
PCI_DEVICE_ID_VIA_8237S
,
0x00
,
0x2f
,
VIA_UDMA_133
|
VIA_BAD_AST
},
{
"vt6410"
,
PCI_DEVICE_ID_VIA_6410
,
0x00
,
0x2f
,
VIA_UDMA_133
|
VIA_BAD_AST
},
{
"vt8251"
,
PCI_DEVICE_ID_VIA_8251
,
0x00
,
0x2f
,
VIA_UDMA_133
|
VIA_BAD_AST
},
...
...
drivers/kvm/vmx.c
浏览文件 @
ae2c27a7
...
...
@@ -1116,6 +1116,8 @@ static int vmx_vcpu_setup(struct kvm_vcpu *vcpu)
if
(
rdmsr_safe
(
index
,
&
data_low
,
&
data_high
)
<
0
)
continue
;
if
(
wrmsr_safe
(
index
,
data_low
,
data_high
)
<
0
)
continue
;
data
=
data_low
|
((
u64
)
data_high
<<
32
);
vcpu
->
host_msrs
[
j
].
index
=
index
;
vcpu
->
host_msrs
[
j
].
reserved
=
0
;
...
...
drivers/net/hamradio/Kconfig
浏览文件 @
ae2c27a7
...
...
@@ -113,7 +113,7 @@ config SCC_TRXECHO
config BAYCOM_SER_FDX
tristate "BAYCOM ser12 fullduplex driver for AX.25"
depends on AX25
depends on AX25
&& !S390
select CRC_CCITT
---help---
This is one of two drivers for Baycom style simple amateur radio
...
...
@@ -133,7 +133,7 @@ config BAYCOM_SER_FDX
config BAYCOM_SER_HDX
tristate "BAYCOM ser12 halfduplex driver for AX.25"
depends on AX25
depends on AX25
&& !S390
select CRC_CCITT
---help---
This is one of two drivers for Baycom style simple amateur radio
...
...
@@ -181,7 +181,7 @@ config BAYCOM_EPP
config YAM
tristate "YAM driver for AX.25"
depends on AX25
depends on AX25
&& !S390
help
The YAM is a modem for packet radio which connects to the serial
port and includes some of the functions of a Terminal Node
...
...
drivers/pci/quirks.c
浏览文件 @
ae2c27a7
...
...
@@ -661,9 +661,11 @@ static void quirk_via_bridge(struct pci_dev *dev)
/* See what bridge we have and find the device ranges */
switch
(
dev
->
device
)
{
case
PCI_DEVICE_ID_VIA_82C686
:
/* 82C686 is special */
via_vlink_dev_lo
=
7
;
via_vlink_dev_hi
=
7
;
/* The VT82C686 is special, it attaches to PCI and can have
any device number. All its subdevices are functions of
that single device. */
via_vlink_dev_lo
=
PCI_SLOT
(
dev
->
devfn
);
via_vlink_dev_hi
=
PCI_SLOT
(
dev
->
devfn
);
break
;
case
PCI_DEVICE_ID_VIA_8237
:
case
PCI_DEVICE_ID_VIA_8237A
:
...
...
drivers/pci/search.c
浏览文件 @
ae2c27a7
...
...
@@ -200,11 +200,8 @@ static struct pci_dev * pci_find_subsys(unsigned int vendor,
* can cause some machines to crash. So here we detect and flag that
* situation and bail out early.
*/
if
(
unlikely
(
list_empty
(
&
pci_devices
)))
{
printk
(
KERN_INFO
"pci_find_subsys() called while pci_devices "
"is still empty
\n
"
);
if
(
unlikely
(
list_empty
(
&
pci_devices
)))
return
NULL
;
}
down_read
(
&
pci_bus_sem
);
n
=
from
?
from
->
global_list
.
next
:
pci_devices
.
next
;
...
...
@@ -278,11 +275,8 @@ pci_get_subsys(unsigned int vendor, unsigned int device,
* can cause some machines to crash. So here we detect and flag that
* situation and bail out early.
*/
if
(
unlikely
(
list_empty
(
&
pci_devices
)))
{
printk
(
KERN_NOTICE
"pci_get_subsys() called while pci_devices "
"is still empty
\n
"
);
if
(
unlikely
(
list_empty
(
&
pci_devices
)))
return
NULL
;
}
down_read
(
&
pci_bus_sem
);
n
=
from
?
from
->
global_list
.
next
:
pci_devices
.
next
;
...
...
fs/nfsd/nfsfh.c
浏览文件 @
ae2c27a7
...
...
@@ -269,7 +269,7 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access)
"acc=%x, error=%d
\n
"
,
dentry
->
d_parent
->
d_name
.
name
,
dentry
->
d_name
.
name
,
access
,
(
error
>>
24
));
access
,
ntohl
(
error
));
}
out:
if
(
exp
&&
!
IS_ERR
(
exp
))
...
...
fs/proc/base.c
浏览文件 @
ae2c27a7
...
...
@@ -2328,13 +2328,23 @@ static int proc_task_readdir(struct file * filp, void * dirent, filldir_t filldi
{
struct
dentry
*
dentry
=
filp
->
f_path
.
dentry
;
struct
inode
*
inode
=
dentry
->
d_inode
;
struct
task_struct
*
leader
=
get_proc_task
(
inode
)
;
struct
task_struct
*
leader
=
NULL
;
struct
task_struct
*
task
;
int
retval
=
-
ENOENT
;
ino_t
ino
;
int
tid
;
unsigned
long
pos
=
filp
->
f_pos
;
/* avoiding "long long" filp->f_pos */
task
=
get_proc_task
(
inode
);
if
(
!
task
)
goto
out_no_task
;
rcu_read_lock
();
if
(
pid_alive
(
task
))
{
leader
=
task
->
group_leader
;
get_task_struct
(
leader
);
}
rcu_read_unlock
();
put_task_struct
(
task
);
if
(
!
leader
)
goto
out_no_task
;
retval
=
0
;
...
...
include/asm-frv/Kbuild
浏览文件 @
ae2c27a7
include include/asm-generic/Kbuild.asm
header-y += registers.h
unifdef-y += termios.h
unifdef-y += ptrace.h
unifdef-y += page.h
include/asm-frv/page.h
浏览文件 @
ae2c27a7
...
...
@@ -76,8 +76,6 @@ extern unsigned long max_pfn;
#endif
/* __ASSEMBLY__ */
#endif
/* __KERNEL__ */
#ifdef CONFIG_CONTIGUOUS_PAGE_ALLOC
#define WANT_PAGE_VIRTUAL 1
#endif
...
...
@@ -85,4 +83,6 @@ extern unsigned long max_pfn;
#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
#endif
/* __KERNEL__ */
#endif
/* _ASM_PAGE_H */
include/asm-frv/ptrace.h
浏览文件 @
ae2c27a7
...
...
@@ -12,9 +12,11 @@
#define _ASM_PTRACE_H
#include <asm/registers.h>
#ifdef __KERNEL__
#include <asm/irq_regs.h>
#define in_syscall(regs) (((regs)->tbr & TBR_TT) == TBR_TT_TRAP0)
#endif
#define PT_PSR 0
...
...
@@ -60,6 +62,7 @@
#define PTRACE_GETFDPIC_EXEC 0
/* [addr] request the executable loadmap */
#define PTRACE_GETFDPIC_INTERP 1
/* [addr] request the interpreter loadmap */
#ifdef __KERNEL__
#ifndef __ASSEMBLY__
/*
...
...
@@ -74,6 +77,7 @@ register struct pt_regs *__frame asm("gr28");
extern
unsigned
long
user_stack
(
const
struct
pt_regs
*
);
extern
void
show_regs
(
struct
pt_regs
*
);
#define profile_pc(regs) ((regs)->pc)
#endif
#endif
/* !__ASSEMBLY__ */
#endif
/* _ASM_PTRACE_H */
include/asm-frv/termios.h
浏览文件 @
ae2c27a7
...
...
@@ -69,6 +69,8 @@ struct termio {
#define N_SYNC_PPP 14
#define N_HCI 15
/* Bluetooth HCI UART */
#ifdef __KERNEL__
#include <asm-generic/termios.h>
#endif
#endif
/* _ASM_TERMIOS_H */
include/asm-um/pgtable.h
浏览文件 @
ae2c27a7
...
...
@@ -408,6 +408,15 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
#include <asm-generic/pgtable-nopud.h>
#ifdef CONFIG_HIGHMEM
/* Clear a kernel PTE and flush it from the TLB */
#define kpte_clear_flush(ptep, vaddr) \
do { \
pte_clear(&init_mm, vaddr, ptep); \
__flush_tlb_one(vaddr); \
} while (0)
#endif
#endif
#endif
...
...
include/linux/efi.h
浏览文件 @
ae2c27a7
...
...
@@ -301,7 +301,7 @@ extern int __init efi_uart_console_only (void);
extern
void
efi_initialize_iomem_resources
(
struct
resource
*
code_resource
,
struct
resource
*
data_resource
);
extern
unsigned
long
efi_get_time
(
void
);
extern
int
__init
efi_set_rtc_mmss
(
unsigned
long
nowtime
);
extern
int
efi_set_rtc_mmss
(
unsigned
long
nowtime
);
extern
int
is_available_memory
(
efi_memory_desc_t
*
md
);
extern
struct
efi_memory_map
memmap
;
...
...
kernel/fork.c
浏览文件 @
ae2c27a7
...
...
@@ -1313,7 +1313,7 @@ noinline struct pt_regs * __devinit __attribute__((weak)) idle_regs(struct pt_re
return
regs
;
}
struct
task_struct
*
__
dev
init
fork_idle
(
int
cpu
)
struct
task_struct
*
__
cpu
init
fork_idle
(
int
cpu
)
{
struct
task_struct
*
task
;
struct
pt_regs
regs
;
...
...
mm/page_alloc.c
浏览文件 @
ae2c27a7
...
...
@@ -989,8 +989,7 @@ int zone_watermark_ok(struct zone *z, int order, unsigned long mark,
int
classzone_idx
,
int
alloc_flags
)
{
/* free_pages my go negative - that's OK */
unsigned
long
min
=
mark
;
long
free_pages
=
z
->
free_pages
-
(
1
<<
order
)
+
1
;
long
min
=
mark
,
free_pages
=
z
->
free_pages
-
(
1
<<
order
)
+
1
;
int
o
;
if
(
alloc_flags
&
ALLOC_HIGH
)
...
...
net/ipv4/netfilter/ip_conntrack_sip.c
浏览文件 @
ae2c27a7
...
...
@@ -283,10 +283,16 @@ static int skp_epaddr_len(const char *dptr, const char *limit, int *shift)
{
int
s
=
*
shift
;
for
(;
dptr
<=
limit
&&
*
dptr
!=
'@'
;
dptr
++
)
/* Search for @, but stop at the end of the line.
* We are inside a sip: URI, so we don't need to worry about
* continuation lines. */
while
(
dptr
<=
limit
&&
*
dptr
!=
'@'
&&
*
dptr
!=
'\r'
&&
*
dptr
!=
'\n'
)
{
(
*
shift
)
++
;
dptr
++
;
}
if
(
*
dptr
==
'@'
)
{
if
(
dptr
<=
limit
&&
*
dptr
==
'@'
)
{
dptr
++
;
(
*
shift
)
++
;
}
else
...
...
net/ipv6/addrconf.c
浏览文件 @
ae2c27a7
...
...
@@ -3393,7 +3393,7 @@ static void inline ipv6_store_devconf(struct ipv6_devconf *cnf,
#ifdef CONFIG_IPV6_ROUTER_PREF
array
[
DEVCONF_ACCEPT_RA_RTR_PREF
]
=
cnf
->
accept_ra_rtr_pref
;
array
[
DEVCONF_RTR_PROBE_INTERVAL
]
=
cnf
->
rtr_probe_interval
;
#ifdef CONFI
V
_IPV6_ROUTE_INFO
#ifdef CONFI
G
_IPV6_ROUTE_INFO
array
[
DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN
]
=
cnf
->
accept_ra_rt_info_max_plen
;
#endif
#endif
...
...
@@ -3898,7 +3898,7 @@ static struct addrconf_sysctl_table
.
proc_handler
=
&
proc_dointvec_jiffies
,
.
strategy
=
&
sysctl_jiffies
,
},
#ifdef CONFI
V
_IPV6_ROUTE_INFO
#ifdef CONFI
G
_IPV6_ROUTE_INFO
{
.
ctl_name
=
NET_IPV6_ACCEPT_RA_RT_INFO_MAX_PLEN
,
.
procname
=
"accept_ra_rt_info_max_plen"
,
...
...
net/ipv6/ndisc.c
浏览文件 @
ae2c27a7
...
...
@@ -1413,6 +1413,13 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh,
return
;
}
if
(
!
ipv6_addr_equal
(
&
skb
->
nh
.
ipv6h
->
daddr
,
target
)
&&
!
(
ipv6_addr_type
(
target
)
&
IPV6_ADDR_LINKLOCAL
))
{
ND_PRINTK2
(
KERN_WARNING
"ICMPv6 Redirect: target address is not link-local.
\n
"
);
return
;
}
ndisc_flow_init
(
&
fl
,
NDISC_REDIRECT
,
&
saddr_buf
,
&
skb
->
nh
.
ipv6h
->
saddr
,
dev
->
ifindex
);
...
...
net/netfilter/Kconfig
浏览文件 @
ae2c27a7
...
...
@@ -628,7 +628,7 @@ config NETFILTER_XT_MATCH_TCPMSS
config NETFILTER_XT_MATCH_HASHLIMIT
tristate '"hashlimit" match support'
depends on NETFILTER_XTABLES
depends on NETFILTER_XTABLES
&& (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
help
This option adds a `hashlimit' match.
...
...
net/netfilter/nf_conntrack_sip.c
浏览文件 @
ae2c27a7
...
...
@@ -303,10 +303,16 @@ static int skp_epaddr_len(struct nf_conn *ct, const char *dptr,
{
int
s
=
*
shift
;
for
(;
dptr
<=
limit
&&
*
dptr
!=
'@'
;
dptr
++
)
/* Search for @, but stop at the end of the line.
* We are inside a sip: URI, so we don't need to worry about
* continuation lines. */
while
(
dptr
<=
limit
&&
*
dptr
!=
'@'
&&
*
dptr
!=
'\r'
&&
*
dptr
!=
'\n'
)
{
(
*
shift
)
++
;
dptr
++
;
}
if
(
*
dptr
==
'@'
)
{
if
(
dptr
<=
limit
&&
*
dptr
==
'@'
)
{
dptr
++
;
(
*
shift
)
++
;
}
else
...
...
net/netfilter/xt_connbytes.c
浏览文件 @
ae2c27a7
...
...
@@ -52,6 +52,8 @@ match(const struct sk_buff *skb,
{
const
struct
xt_connbytes_info
*
sinfo
=
matchinfo
;
u_int64_t
what
=
0
;
/* initialize to make gcc happy */
u_int64_t
bytes
=
0
;
u_int64_t
pkts
=
0
;
const
struct
ip_conntrack_counter
*
counters
;
if
(
!
(
counters
=
nf_ct_get_counters
(
skb
)))
...
...
@@ -89,29 +91,22 @@ match(const struct sk_buff *skb,
case
XT_CONNBYTES_AVGPKT
:
switch
(
sinfo
->
direction
)
{
case
XT_CONNBYTES_DIR_ORIGINAL
:
what
=
div64_64
(
counters
[
IP_CT_DIR_ORIGINAL
].
bytes
,
counters
[
IP_CT_DIR_ORIGINAL
].
packets
)
;
bytes
=
counters
[
IP_CT_DIR_ORIGINAL
].
bytes
;
pkts
=
counters
[
IP_CT_DIR_ORIGINAL
].
packets
;
break
;
case
XT_CONNBYTES_DIR_REPLY
:
what
=
div64_64
(
counters
[
IP_CT_DIR_REPLY
].
bytes
,
counters
[
IP_CT_DIR_REPLY
].
packets
)
;
bytes
=
counters
[
IP_CT_DIR_REPLY
].
bytes
;
pkts
=
counters
[
IP_CT_DIR_REPLY
].
packets
;
break
;
case
XT_CONNBYTES_DIR_BOTH
:
{
u_int64_t
bytes
;
u_int64_t
pkts
;
bytes
=
counters
[
IP_CT_DIR_ORIGINAL
].
bytes
+
counters
[
IP_CT_DIR_REPLY
].
bytes
;
pkts
=
counters
[
IP_CT_DIR_ORIGINAL
].
packets
+
counters
[
IP_CT_DIR_REPLY
].
packets
;
/* FIXME_THEORETICAL: what to do if sum
* overflows ? */
what
=
div64_64
(
bytes
,
pkts
);
}
bytes
=
counters
[
IP_CT_DIR_ORIGINAL
].
bytes
+
counters
[
IP_CT_DIR_REPLY
].
bytes
;
pkts
=
counters
[
IP_CT_DIR_ORIGINAL
].
packets
+
counters
[
IP_CT_DIR_REPLY
].
packets
;
break
;
}
if
(
pkts
!=
0
)
what
=
div64_64
(
bytes
,
pkts
);
break
;
}
...
...
net/sctp/sm_sideeffect.c
浏览文件 @
ae2c27a7
...
...
@@ -621,7 +621,13 @@ static void sctp_cmd_transport_on(sctp_cmd_seq_t *cmds,
/* The receiver of the HEARTBEAT ACK should also perform an
* RTT measurement for that destination transport address
* using the time value carried in the HEARTBEAT ACK chunk.
* If the transport's rto_pending variable has been cleared,
* it was most likely due to a retransmit. However, we want
* to re-enable it to properly update the rto.
*/
if
(
t
->
rto_pending
==
0
)
t
->
rto_pending
=
1
;
hbinfo
=
(
sctp_sender_hb_info_t
*
)
chunk
->
skb
->
data
;
sctp_transport_update_rto
(
t
,
(
jiffies
-
hbinfo
->
sent_at
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录