diff options
Diffstat (limited to 'arch/powerpc/kernel/vdso.c')
| -rw-r--r-- | arch/powerpc/kernel/vdso.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c index f177c60ea766..65639a43e644 100644 --- a/arch/powerpc/kernel/vdso.c +++ b/arch/powerpc/kernel/vdso.c | |||
| @@ -788,9 +788,7 @@ static int __init vdso_init(void) | |||
| 788 | 788 | ||
| 789 | return 0; | 789 | return 0; |
| 790 | } | 790 | } |
| 791 | #ifdef CONFIG_PPC_MERGE | ||
| 792 | arch_initcall(vdso_init); | 791 | arch_initcall(vdso_init); |
| 793 | #endif | ||
| 794 | 792 | ||
| 795 | int in_gate_area_no_task(unsigned long addr) | 793 | int in_gate_area_no_task(unsigned long addr) |
| 796 | { | 794 | { |