Subject: [PATCH] [PPC] Disable vDSO support for ARCH=ppc where it's not implemented.

From: Wolfgang Denk <[email-masked]>
Date: Wed, 10 Oct 2007 00:36:18 +0200

Signed-off-by: Wolfgang Denk <[email-masked]>
---
 arch/powerpc/kernel/vdso.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index 213fa31..2322ba5 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -766,7 +766,9 @@ static int __init vdso_init(void)
 
 	return 0;
 }
+#ifdef CONFIG_PPC_MERGE
 arch_initcall(vdso_init);
+#endif
 
 int in_gate_area_no_task(unsigned long addr)
 {
-- 
1.5.2.2