diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-14 11:51:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-14 11:51:50 -0800 |
| commit | 536e89ee53e9cbdec00e49ae1888bffa262043d8 (patch) | |
| tree | 79f842cdd5217986204faf8d4c0aa707b64356bf /arch/x86/kernel/asm-offsets_64.c | |
| parent | 9ea18f8cab5f1c36cdd0f09717e35ceb48c36a87 (diff) | |
| parent | 0e58af4e1d2166e9e33375a0f121e4867010d4f8 (diff) | |
| download | op-kernel-dev-536e89ee53e9cbdec00e49ae1888bffa262043d8.zip op-kernel-dev-536e89ee53e9cbdec00e49ae1888bffa262043d8.tar.gz | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Misc fixes (mainly Andy's TLS fixes), plus a cleanup"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/tls: Disallow unusual TLS segments
x86/tls: Validate TLS entries to protect espfix
MAINTAINERS: Add me as x86 VDSO submaintainer
x86/asm: Unify segment selector defines
x86/asm: Guard against building the 32/64-bit versions of the asm-offsets*.c file directly
x86_64, switch_to(): Load TLS descriptors before switching DS and ES
x86/mm: Use min() instead of min_t() in the e820 printout code
x86/mm: Fix zone ranges boot printout
x86/doc: Update documentation after file shuffling
Diffstat (limited to 'arch/x86/kernel/asm-offsets_64.c')
| -rw-r--r-- | arch/x86/kernel/asm-offsets_64.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c index 4f9359f..fdcbb4d 100644 --- a/arch/x86/kernel/asm-offsets_64.c +++ b/arch/x86/kernel/asm-offsets_64.c @@ -1,3 +1,7 @@ +#ifndef __LINUX_KBUILD_H +# error "Please do not build this file directly, build asm-offsets.c instead" +#endif + #include <asm/ia32.h> #define __SYSCALL_64(nr, sym, compat) [nr] = 1, |
