diff options
| author | Jeremy Fitzhardinge <jeremy@goop.org> | 2008-06-16 18:01:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-20 08:55:13 -0400 |
| commit | a987b16cc6123af2c9414032701bab5f73c54c89 (patch) | |
| tree | d7ec13530d9824b12cc521b907bffdc337435865 /arch/x86/xen/xen-head.S | |
| parent | eb179e443deb0a5c81a62b4c157124a4b7ff1813 (diff) | |
xen: don't drop NX bit
Because NX is now enforced properly, we must put the hypercall page
into the .text segment so that it is executable.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Stable Kernel <stable@kernel.org>
Cc: the arch/x86 maintainers <x86@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/xen/xen-head.S')
| -rw-r--r-- | arch/x86/xen/xen-head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S index ef6c9e005f90..7c0cf6320a0a 100644 --- a/arch/x86/xen/xen-head.S +++ b/arch/x86/xen/xen-head.S | |||
| @@ -18,7 +18,7 @@ ENTRY(startup_xen) | |||
| 18 | 18 | ||
| 19 | __FINIT | 19 | __FINIT |
| 20 | 20 | ||
| 21 | .pushsection .bss.page_aligned | 21 | .pushsection .text |
| 22 | .align PAGE_SIZE_asm | 22 | .align PAGE_SIZE_asm |
| 23 | ENTRY(hypercall_page) | 23 | ENTRY(hypercall_page) |
| 24 | .skip 0x1000 | 24 | .skip 0x1000 |