diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-09 11:23:57 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-09 11:23:57 +0100 |
| commit | 95a9ca74768089d89c17ba958d6f009aa9c18525 (patch) | |
| tree | 513200c0d5255eb1918f64fc11417858b1539ebb /arch/sparc/mm | |
| parent | 4e2576bd36a12e78ac3786d05b99a820dffe687f (diff) | |
| parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff) | |
Merge tag 'v4.0-rc7' into asoc-core
Linux 4.0-rc7
Diffstat (limited to 'arch/sparc/mm')
| -rw-r--r-- | arch/sparc/mm/init_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index 3ea267c53320..4ca0d6ba5ec8 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c @@ -2820,7 +2820,7 @@ static int __init report_memory(void) return 0; } -device_initcall(report_memory); +arch_initcall(report_memory); #ifdef CONFIG_SMP #define do_flush_tlb_kernel_range smp_flush_tlb_kernel_range |