From: Wolfgang Denk <wd@denx.de>
Date: Tue, 9 Oct 2007 22:36:18 +0000 (+1000)
Subject: [POWERPC] Disable vDSO support for ARCH=ppc where it's not implemented
X-Git-Tag: v2.6.24-rc1~1450^2~30
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=dc9b43d0f706852fc4abce5bf28958db41524328;p=linux-2.6-omap-h63xx.git

[POWERPC] Disable vDSO support for ARCH=ppc where it's not implemented

Signed-off-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index 213fa31ac53..2322ba5cce4 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)
 {