The patch titled
broken CONFIG_COMPAT_VDSO on i386
has been removed from the -mm tree. Its filename was
broken-config_compat_vdso-on-i386.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: broken CONFIG_COMPAT_VDSO on i386
From: "Jan Beulich" <jbeulich@xxxxxxxxxx>
After updating several machines to 2.6.20, I can't boot anymore the single
one of them that supports the NX bit and is configured as a 32-bit system.
My understanding is that the VDSO changes in 2.6.20-rc7 were not fully
cooked, in that with that config option enabled VDSO_SYM(x) now equals x,
meaning that an address in the fixmap area is now being passed to apps via
AT_SYSINFO. However, the page is mapped with PAGE_READONLY rather than
PAGE_READONLY_EXEC.
I'm not certain whether having app code go through the fixmap area is
intended, but in case it is here is the simple patch that makes things work
again.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: "Yi Feng" <yifeng@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/i386/kernel/sysenter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN arch/i386/kernel/sysenter.c~broken-config_compat_vdso-on-i386 arch/i386/kernel/sysenter.c
--- a/arch/i386/kernel/sysenter.c~broken-config_compat_vdso-on-i386
+++ a/arch/i386/kernel/sysenter.c
@@ -78,7 +78,7 @@ int __init sysenter_setup(void)
syscall_pages[0] = virt_to_page(syscall_page);
#ifdef CONFIG_COMPAT_VDSO
- __set_fixmap(FIX_VDSO, __pa(syscall_page), PAGE_READONLY);
+ __set_fixmap(FIX_VDSO, __pa(syscall_page), PAGE_READONLY_EXEC);
printk("Compat vDSO mapped to %08lx.\n", __fix_to_virt(FIX_VDSO));
#endif
_
Patches currently in -mm which might be from jbeulich@xxxxxxxxxx are
origin.patch
i386-adjustments-to-page-table-dump-during-oops-v3.patch
x86-mtrr-range-check-correction.patch
x86-consolidate-smp_send_stop.patch
small-irq-management-simplification.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
