diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-02 14:43:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-02 14:43:58 -0700 |
| commit | a8bdf745126593308927dfa264d3d2158338a148 (patch) | |
| tree | d99e50133bac166ae4017ca4f0143c3e57da3825 /arch/x86/include | |
| parent | fbe8ed634d3f7db92227d84363264868bd7ed751 (diff) | |
| parent | 78d77df71510a96e042de7ba6dbd7998103642cb (diff) | |
| download | linux-3.10-a8bdf745126593308927dfa264d3d2158338a148.tar.gz linux-3.10-a8bdf745126593308927dfa264d3d2158338a148.tar.bz2 linux-3.10-a8bdf745126593308927dfa264d3d2158338a148.zip | |
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/include')
| -rw-r--r-- | arch/x86/include/asm/suspend_32.h | 1 | ||||
| -rw-r--r-- | arch/x86/include/asm/suspend_64.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/include/asm/suspend_32.h b/arch/x86/include/asm/suspend_32.h index f6064b7385b..552d6c90a6d 100644 --- a/arch/x86/include/asm/suspend_32.h +++ b/arch/x86/include/asm/suspend_32.h @@ -15,6 +15,7 @@ struct saved_context { unsigned long cr0, cr2, cr3, cr4; u64 misc_enable; bool misc_enable_saved; + struct desc_ptr gdt_desc; struct desc_ptr idt; u16 ldt; u16 tss; diff --git a/arch/x86/include/asm/suspend_64.h b/arch/x86/include/asm/suspend_64.h index 97b84e08a21..bc6232834ba 100644 --- a/arch/x86/include/asm/suspend_64.h +++ b/arch/x86/include/asm/suspend_64.h @@ -25,6 +25,8 @@ struct saved_context { u64 misc_enable; bool misc_enable_saved; unsigned long efer; + u16 gdt_pad; /* Unused */ + struct desc_ptr gdt_desc; u16 idt_pad; u16 idt_limit; unsigned long idt_base; |