diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-10-09 18:36:18 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-10-11 06:25:25 -0400 |
| commit | dc9b43d0f706852fc4abce5bf28958db41524328 (patch) | |
| tree | b739679c5714ab93fd9bb02712c53daa108ac422 /arch | |
| parent | 46b45b10f1425d02819b525e3805ddacd9ad4f29 (diff) | |
[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) | |||
| 766 | 766 | ||
| 767 | return 0; | 767 | return 0; |
| 768 | } | 768 | } |
| 769 | #ifdef CONFIG_PPC_MERGE | ||
| 769 | arch_initcall(vdso_init); | 770 | arch_initcall(vdso_init); |
| 771 | #endif | ||
| 770 | 772 | ||
| 771 | int in_gate_area_no_task(unsigned long addr) | 773 | int in_gate_area_no_task(unsigned long addr) |
| 772 | { | 774 | { |