diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-07-25 11:37:07 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-25 11:37:07 +0200 |
| commit | 0e2f65ee30eee2db054f7fd73f462c5da33ec963 (patch) | |
| tree | 26c61eb7745da0c0d9135e9d12088f570cb8530d /include/asm-x86/ptrace.h | |
| parent | Merge branch 'linus' into x86/pebs (diff) | |
| parent | fix fs/nfs/nfsroot.c compilation (diff) | |
| download | linux-dev-0e2f65ee30eee2db054f7fd73f462c5da33ec963.tar.xz linux-dev-0e2f65ee30eee2db054f7fd73f462c5da33ec963.zip | |
Merge branch 'linus' into x86/pebs
Conflicts:
arch/x86/Kconfig.cpu
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/setup_64.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/ptrace.h')
| -rw-r--r-- | include/asm-x86/ptrace.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/asm-x86/ptrace.h b/include/asm-x86/ptrace.h index 6303701d18e3..5e0c48d24b1a 100644 --- a/include/asm-x86/ptrace.h +++ b/include/asm-x86/ptrace.h @@ -3,7 +3,12 @@ #include <linux/compiler.h> /* For __user */ #include <asm/ptrace-abi.h> +#include <asm/processor-flags.h> +#ifdef __KERNEL__ +#include <asm/ds.h> /* the DS BTS struct is used for ptrace too */ +#include <asm/segment.h> +#endif #ifndef __ASSEMBLY__ @@ -55,9 +60,6 @@ struct pt_regs { unsigned long ss; }; -#include <asm/vm86.h> -#include <asm/segment.h> - #endif /* __KERNEL__ */ #else /* __i386__ */ |