--- zzzz-none-000/linux-2.6.19.2/arch/powerpc/kernel/vdso.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/arch/powerpc/kernel/vdso.c	2007-01-19 14:42:56.000000000 +0000
@@ -36,8 +36,6 @@
 #include <asm/vdso.h>
 #include <asm/vdso_datapage.h>
 
-#include "setup.h"
-
 #undef DEBUG
 
 #ifdef DEBUG
@@ -239,7 +237,7 @@
 	vdso_base = VDSO32_MBASE;
 #endif
 
-	current->mm->context.vdso_base = 0;
+	current->mm->context.vdso_base = ~0UL;
 
 	/* vDSO has a problem and was disabled, just don't "enable" it for the
 	 * process
@@ -256,7 +254,7 @@
 	 */
 	down_write(&mm->mmap_sem);
 	vdso_base = get_unmapped_area(NULL, vdso_base,
-				      vdso_pages << PAGE_SHIFT, 0, 0);
+				      vdso_pages << PAGE_SHIFT, 0, MAP_PRIVATE | MAP_EXECUTABLE);
 	if (IS_ERR_VALUE(vdso_base)) {
 		rc = vdso_base;
 		goto fail_mmapsem;
@@ -284,8 +282,14 @@
 	 * pages though
 	 */
 	vma->vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC;
+
+#ifdef CONFIG_PAX_MPROTECT
+	if (mm->pax_flags & MF_PAX_MPROTECT)
+		vma->vm_flags &= ~VM_MAYWRITE;
+#endif
+
 	vma->vm_flags |= mm->def_flags;
-	vma->vm_page_prot = protection_map[vma->vm_flags & 0x7];
+	vma->vm_page_prot = protection_map[vma->vm_flags & (VM_READ|VM_WRITE|VM_EXEC)];
 	vma->vm_ops = &vdso_vmops;
 
 	/* Insert new VMA */
@@ -588,43 +592,6 @@
 	return 0;
 }
 
-
-static __init int vdso_fixup_features(struct lib32_elfinfo *v32,
-				      struct lib64_elfinfo *v64)
-{
-	void *start32;
-	unsigned long size32;
-
-#ifdef CONFIG_PPC64
-	void *start64;
-	unsigned long size64;
-
-	start64 = find_section64(v64->hdr, "__ftr_fixup", &size64);
-	if (start64)
-		do_feature_fixups(cur_cpu_spec->cpu_features,
-				  start64, start64 + size64);
-
-	start64 = find_section64(v64->hdr, "__fw_ftr_fixup", &size64);
-	if (start64)
-		do_feature_fixups(powerpc_firmware_features,
-				  start64, start64 + size64);
-#endif /* CONFIG_PPC64 */
-
-	start32 = find_section32(v32->hdr, "__ftr_fixup", &size32);
-	if (start32)
-		do_feature_fixups(cur_cpu_spec->cpu_features,
-				  start32, start32 + size32);
-
-#ifdef CONFIG_PPC64
-	start32 = find_section32(v32->hdr, "__fw_ftr_fixup", &size32);
-	if (start32)
-		do_feature_fixups(powerpc_firmware_features,
-				  start32, start32 + size32);
-#endif /* CONFIG_PPC64 */
-
-	return 0;
-}
-
 static __init int vdso_fixup_alt_funcs(struct lib32_elfinfo *v32,
 				       struct lib64_elfinfo *v64)
 {
@@ -673,9 +640,6 @@
 	if (vdso_fixup_datapage(&v32, &v64))
 		return -1;
 
-	if (vdso_fixup_features(&v32, &v64))
-		return -1;
-
 	if (vdso_fixup_alt_funcs(&v32, &v64))
 		return -1;
 
@@ -756,7 +720,6 @@
 	 * Setup the syscall map in the vDOS
 	 */
 	vdso_setup_syscall_map();
-
 	/*
 	 * Initialize the vDSO images in memory, that is do necessary
 	 * fixups of vDSO symbols, locate trampolines, etc...