diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-05 05:06:47 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-05 05:06:47 -0500 |
| commit | 508827ff0ac3981d420edac64a70de7f4e304d38 (patch) | |
| tree | b0cee8ddef9f0ceab68c388e4ae46b7295eb2cb5 /arch/x86/kernel | |
| parent | 2c3c3d02f28801d7ad2da4952b2c7ca6621ef221 (diff) | |
| parent | 72e2240f181871675d3a979766330c91d48a1673 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tokenring/tmspci.c
drivers/net/ucc_geth_mii.c
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/ptrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index 5a4c23d89892..06ca07f6ad86 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c | |||
| @@ -1388,7 +1388,7 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, | |||
| 1388 | #ifdef CONFIG_X86_32 | 1388 | #ifdef CONFIG_X86_32 |
| 1389 | # define IS_IA32 1 | 1389 | # define IS_IA32 1 |
| 1390 | #elif defined CONFIG_IA32_EMULATION | 1390 | #elif defined CONFIG_IA32_EMULATION |
| 1391 | # define IS_IA32 test_thread_flag(TIF_IA32) | 1391 | # define IS_IA32 is_compat_task() |
| 1392 | #else | 1392 | #else |
| 1393 | # define IS_IA32 0 | 1393 | # define IS_IA32 0 |
| 1394 | #endif | 1394 | #endif |