diff options
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/asm-offsets_32.c | 9 | ||||
-rw-r--r-- | arch/x86/kernel/asm-offsets_64.c | 9 |
2 files changed, 2 insertions, 16 deletions
diff --git a/arch/x86/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c index 670c3c311289..92588083950f 100644 --- a/arch/x86/kernel/asm-offsets_32.c +++ b/arch/x86/kernel/asm-offsets_32.c | |||
@@ -9,6 +9,7 @@ | |||
9 | #include <linux/signal.h> | 9 | #include <linux/signal.h> |
10 | #include <linux/personality.h> | 10 | #include <linux/personality.h> |
11 | #include <linux/suspend.h> | 11 | #include <linux/suspend.h> |
12 | #include <linux/kbuild.h> | ||
12 | #include <asm/ucontext.h> | 13 | #include <asm/ucontext.h> |
13 | #include "sigframe.h" | 14 | #include "sigframe.h" |
14 | #include <asm/pgtable.h> | 15 | #include <asm/pgtable.h> |
@@ -23,14 +24,6 @@ | |||
23 | #include <linux/lguest.h> | 24 | #include <linux/lguest.h> |
24 | #include "../../../drivers/lguest/lg.h" | 25 | #include "../../../drivers/lguest/lg.h" |
25 | 26 | ||
26 | #define DEFINE(sym, val) \ | ||
27 | asm volatile("\n->" #sym " %0 " #val : : "i" (val)) | ||
28 | |||
29 | #define BLANK() asm volatile("\n->" : : ) | ||
30 | |||
31 | #define OFFSET(sym, str, mem) \ | ||
32 | DEFINE(sym, offsetof(struct str, mem)); | ||
33 | |||
34 | /* workaround for a warning with -Wmissing-prototypes */ | 27 | /* workaround for a warning with -Wmissing-prototypes */ |
35 | void foo(void); | 28 | void foo(void); |
36 | 29 | ||
diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c index 494e1e096ee6..f126c05d6170 100644 --- a/arch/x86/kernel/asm-offsets_64.c +++ b/arch/x86/kernel/asm-offsets_64.c | |||
@@ -10,6 +10,7 @@ | |||
10 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
11 | #include <linux/hardirq.h> | 11 | #include <linux/hardirq.h> |
12 | #include <linux/suspend.h> | 12 | #include <linux/suspend.h> |
13 | #include <linux/kbuild.h> | ||
13 | #include <asm/pda.h> | 14 | #include <asm/pda.h> |
14 | #include <asm/processor.h> | 15 | #include <asm/processor.h> |
15 | #include <asm/segment.h> | 16 | #include <asm/segment.h> |
@@ -17,14 +18,6 @@ | |||
17 | #include <asm/ia32.h> | 18 | #include <asm/ia32.h> |
18 | #include <asm/bootparam.h> | 19 | #include <asm/bootparam.h> |
19 | 20 | ||
20 | #define DEFINE(sym, val) \ | ||
21 | asm volatile("\n->" #sym " %0 " #val : : "i" (val)) | ||
22 | |||
23 | #define BLANK() asm volatile("\n->" : : ) | ||
24 | |||
25 | #define OFFSET(sym, str, mem) \ | ||
26 | DEFINE(sym, offsetof(struct str, mem)) | ||
27 | |||
28 | #define __NO_STUBS 1 | 21 | #define __NO_STUBS 1 |
29 | #undef __SYSCALL | 22 | #undef __SYSCALL |
30 | #undef _ASM_X86_64_UNISTD_H_ | 23 | #undef _ASM_X86_64_UNISTD_H_ |