diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-10-10 08:36:18 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-10-11 20:25:25 +1000 |
| commit | dc9b43d0f706852fc4abce5bf28958db41524328 (patch) | |
| tree | b739679c5714ab93fd9bb02712c53daa108ac422 /arch | |
| parent | 46b45b10f1425d02819b525e3805ddacd9ad4f29 (diff) | |
| download | linux-dc9b43d0f706852fc4abce5bf28958db41524328.tar.gz linux-dc9b43d0f706852fc4abce5bf28958db41524328.tar.bz2 linux-dc9b43d0f706852fc4abce5bf28958db41524328.zip | |
[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>
Diffstat (limited to 'arch')
| -rw-r--r-- | 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 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) { |