summaryrefslogtreecommitdiffstats
path: root/arch/x86/pci
diff options
context:
space:
mode:
authorLin Ming <ming.m.lin@intel.com>2010-11-22 14:03:28 +0100
committerThomas Gleixner <tglx@linutronix.de>2010-11-22 14:38:52 +0100
commit691513f70d3957939a318da970987b876c720861 (patch)
treecdaf1826d5895d058e6606eb37a6322892d1d977 /arch/x86/pci
parentx86: Add RO/NX protection for loadable kernel modules (diff)
downloadlinux-691513f70d3957939a318da970987b876c720861.tar.xz
linux-691513f70d3957939a318da970987b876c720861.zip
x86: Resume trampoline must be executable
commit 5bd5a452(x86: Add NX protection for kernel data) marked the trampoline area NX - which unsurprisingly breaks resume and cpu hotplug. Revert the portion of that commit, which touches the trampoline. Originally-from: Lin Ming <ming.m.lin@intel.com> LKML-Reference: <1290410581.2405.24.camel@minggr.sh.intel.com> Cc: Matthieu Castet <castet.matthieu@free.fr> Cc: Siarhei Liakh <sliakh.lkml@gmail.com> Cc: Xuxian Jiang <jiang@cs.ncsu.edu> Cc: Ingo Molnar <mingo@elte.hu> Cc: Arjan van de Ven <arjan@infradead.org> Cc: Andi Kleen <andi@firstfloor.org> Tested-by: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/pci')
0 files changed, 0 insertions, 0 deletions