diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-02 21:43:58 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-02 21:43:58 (GMT) |
| commit | a8bdf745126593308927dfa264d3d2158338a148 (patch) | |
| tree | d99e50133bac166ae4017ca4f0143c3e57da3825 /arch/x86/kernel/asm-offsets_32.c | |
| parent | fbe8ed634d3f7db92227d84363264868bd7ed751 (diff) | |
| parent | 78d77df71510a96e042de7ba6dbd7998103642cb (diff) | |
| download | linux-fsl-qoriq-a8bdf745126593308927dfa264d3d2158338a148.tar.xz | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Peter Anvin:
"Two regression fixes:
1. On 64 bits, we would set NX on non-NX-capable hardware (very rare
in 64-bit land, but a nonzero subset.)
2. Fix suspend/resume across kernel versions"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86-64, init: Do not set NX bits on non-NX capable hardware
x86, gdt, hibernate: Store/load GDT for hibernate path.
Diffstat (limited to 'arch/x86/kernel/asm-offsets_32.c')
| -rw-r--r-- | arch/x86/kernel/asm-offsets_32.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c index 85d98ab..0ef4bba 100644 --- a/arch/x86/kernel/asm-offsets_32.c +++ b/arch/x86/kernel/asm-offsets_32.c @@ -60,6 +60,9 @@ void foo(void) OFFSET(IA32_RT_SIGFRAME_sigcontext, rt_sigframe, uc.uc_mcontext); BLANK(); + OFFSET(saved_context_gdt_desc, saved_context, gdt_desc); + BLANK(); + /* Offset from the sysenter stack to tss.sp0 */ DEFINE(TSS_sysenter_sp0, offsetof(struct tss_struct, x86_tss.sp0) - sizeof(struct tss_struct)); |