diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-07-28 02:28:28 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-07-28 02:28:28 -0400 |
| commit | d3608b5681d238605b7da6be62244e803e24c649 (patch) | |
| tree | 1fc47e9f58e6e938eefd40904745a60986739bde /arch/mips/kernel/vdso.c | |
| parent | 650fb4393dff543bc980d361555c489fbdeed088 (diff) | |
| parent | 113fc5a6e8c2288619ff7e8187a6f556b7e0d372 (diff) | |
Merge remote branch 'origin/x86/urgent' into x86/asm
Diffstat (limited to 'arch/mips/kernel/vdso.c')
| -rw-r--r-- | arch/mips/kernel/vdso.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/mips/kernel/vdso.c b/arch/mips/kernel/vdso.c index b773c1112b14..e5cdfd603f8f 100644 --- a/arch/mips/kernel/vdso.c +++ b/arch/mips/kernel/vdso.c | |||
| @@ -61,11 +61,9 @@ static int __init init_vdso(void) | |||
| 61 | 61 | ||
| 62 | vunmap(vdso); | 62 | vunmap(vdso); |
| 63 | 63 | ||
| 64 | pr_notice("init_vdso successfull\n"); | ||
| 65 | |||
| 66 | return 0; | 64 | return 0; |
| 67 | } | 65 | } |
| 68 | device_initcall(init_vdso); | 66 | subsys_initcall(init_vdso); |
| 69 | 67 | ||
| 70 | static unsigned long vdso_addr(unsigned long start) | 68 | static unsigned long vdso_addr(unsigned long start) |
| 71 | { | 69 | { |