From dc9b43d0f706852fc4abce5bf28958db41524328 Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@denx.de>
Date: Wed, 10 Oct 2007 08:36:18 +1000
Subject: [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>
---
 arch/powerpc/kernel/vdso.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'arch/powerpc/kernel/vdso.c')

diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index 213fa31ac537..2322ba5cce4c 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)
 {
-- 
cgit v1.2.3