Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

[karo-tx-linux.git] / arch / arm / mm / proc-arm7tdmi.S

diff --git a/arch/arm/mm/proc-arm7tdmi.S b/arch/arm/mm/proc-arm7tdmi.S
index 6a850dbba22e5ff7be9aae70476489feeaaeef18..e4c165ca669680eb6d74ce8e3d5822de50bbe44f 100644 (file)
--- a/arch/arm/mm/proc-arm7tdmi.S
+++ b/arch/arm/mm/proc-arm7tdmi.S
@@ -46,7 +46,7 @@ ENTRY(cpu_arm7tdmi_proc_fin)
 ENTRY(cpu_arm7tdmi_reset)
                mov     pc, r0
 
-               __INIT
+               __CPUINIT
 
                .type   __arm7tdmi_setup, #function
 __arm7tdmi_setup:
@@ -70,6 +70,9 @@ ENTRY(arm7tdmi_processor_functions)
                .word   cpu_arm7tdmi_dcache_clean_area
                .word   cpu_arm7tdmi_switch_mm
                .word   0               @ cpu_*_set_pte
+               .word   0
+               .word   0
+               .word   0
                .size   arm7tdmi_processor_functions, . - arm7tdmi_processor_functions
 
                .section ".rodata"