MIPS: Whitespace cleanup.

[linux-drm-fsl-dcu.git] / arch / mips / kernel / relocate_kernel.S

diff --git a/arch/mips/kernel/relocate_kernel.S b/arch/mips/kernel/relocate_kernel.S
index e4142c5f7c2b6f16434275436668f7c17f67c68a..43d2d78d3287dfbfa52ad7fb1a52f6571d9deaa3 100644 (file)
--- a/arch/mips/kernel/relocate_kernel.S
+++ b/arch/mips/kernel/relocate_kernel.S
@@ -9,7 +9,6 @@
 #include <asm/asm.h>
 #include <asm/asmmacro.h>
 #include <asm/regdef.h>
-#include <asm/page.h>
 #include <asm/mipsregs.h>
 #include <asm/stackframe.h>
 #include <asm/addrspace.h>
@@ -34,7 +33,7 @@ process_entry:
        b               process_entry
 
 1:
-       /* indirection page, update s0  */
+       /* indirection page, update s0  */
        and             s3, s2, 0x2
        beq             s3, zero, 1f
        and             s0, s2, ~0x2
@@ -50,7 +49,7 @@ process_entry:
        and             s3, s2, 0x8
        beq             s3, zero, process_entry
        and             s2, s2, ~0x8
-       li              s6, (1 << PAGE_SHIFT) / SZREG
+       li              s6, (1 << _PAGE_SHIFT) / SZREG
 
 copy_word:
        /* copy page word by word */
@@ -70,7 +69,7 @@ done:
           of kexec_flag.  */
 
        bal             1f
- 1:    move            t1,ra;
+ 1:    move            t1,ra;
        PTR_LA          t2,1b
        PTR_LA          t0,kexec_flag
        PTR_SUB         t0,t0,t2;
@@ -159,10 +158,10 @@ arg3:     PTR             0x0
  */
 secondary_kexec_args:
        EXPORT(secondary_kexec_args)
-s_arg0:        PTR             0x0
-s_arg1:        PTR             0x0
-s_arg2:        PTR             0x0
-s_arg3:        PTR             0x0
+s_arg0: PTR            0x0
+s_arg1: PTR            0x0
+s_arg2: PTR            0x0
+s_arg3: PTR            0x0
        .size   secondary_kexec_args,PTRSIZE*4
 kexec_flag:
        LONG            0x1