[Xen-changelog] [xen-unstable] xen: arm: fix long lines in entry.S

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1355926587 0
# Node ID 32db97a8db862a89519495ef8f1f1c5eb48d48a2
# Parent  519ae882d3ff0458450f693ec2427c348227fd22
xen: arm: fix long lines in entry.S

This is a purely whitespace change.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
Committed-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---


diff -r 519ae882d3ff -r 32db97a8db86 xen/arch/arm/entry.S
--- a/xen/arch/arm/entry.S      Wed Dec 19 14:16:27 2012 +0000
+++ b/xen/arch/arm/entry.S      Wed Dec 19 14:16:27 2012 +0000
@@ -11,22 +11,22 @@
 #define RESTORE_BANKED(mode) \
        RESTORE_ONE_BANKED(SP_##mode) ; RESTORE_ONE_BANKED(LR_##mode) ; 
RESTORE_ONE_BANKED(SPSR_##mode)
 
-#define SAVE_ALL                                                               
                        \
-       sub sp, #(UREGS_R8_fiq - UREGS_sp); /* SP, LR, SPSR, PC */              
                        \
-       push {r0-r12}; /* Save R0-R12 */                                        
                        \
-                                                                               
                        \
-       mrs r11, ELR_hyp;               /* ELR_hyp is return address. */        
                        \
-       str r11, [sp, #UREGS_pc];                                               
                        \
-                                                                               
                        \
-       str lr, [sp, #UREGS_lr];                                                
                        \
-                                                                               
                        \
-       add r11, sp, #UREGS_kernel_sizeof+4;                                    
                        \
-       str r11, [sp, #UREGS_sp];                                               
                        \
-                                                                               
                        \
-       mrs r11, SPSR_hyp;                                                      
                        \
-       str r11, [sp, #UREGS_cpsr];                                             
                        \
-       and r11, #PSR_MODE_MASK;                                                
                        \
-       cmp r11, #PSR_MODE_HYP;                                                 
                        \
+#define SAVE_ALL                                                       \
+       sub sp, #(UREGS_R8_fiq - UREGS_sp); /* SP, LR, SPSR, PC */      \
+       push {r0-r12}; /* Save R0-R12 */                                \
+                                                                       \
+       mrs r11, ELR_hyp;               /* ELR_hyp is return address. */\
+       str r11, [sp, #UREGS_pc];                                       \
+                                                                       \
+       str lr, [sp, #UREGS_lr];                                        \
+                                                                       \
+       add r11, sp, #UREGS_kernel_sizeof+4;                            \
+       str r11, [sp, #UREGS_sp];                                       \
+                                                                       \
+       mrs r11, SPSR_hyp;                                              \
+       str r11, [sp, #UREGS_cpsr];                                     \
+       and r11, #PSR_MODE_MASK;                                        \
+       cmp r11, #PSR_MODE_HYP;                                         \
        blne save_guest_regs
 
 save_guest_regs:
@@ -43,25 +43,25 @@ save_guest_regs:
        SAVE_ONE_BANKED(R11_fiq); SAVE_ONE_BANKED(R12_fiq);
        mov pc, lr
 
-#define DEFINE_TRAP_ENTRY(trap)                                                
                                \
-       ALIGN;                                                                  
                        \
-trap_##trap:                                                                   
                        \
-       SAVE_ALL;                                                               
                        \
-       cpsie i;        /* local_irq_enable */                                  
                        \
-       adr lr, return_from_trap;                                               
                        \
-       mov r0, sp;                                                             
                        \
-       mov r11, sp;                                                            
                        \
-       bic sp, #7; /* Align the stack pointer (noop on guest trap) */          
                        \
+#define DEFINE_TRAP_ENTRY(trap)                                                
\
+       ALIGN;                                                          \
+trap_##trap:                                                           \
+       SAVE_ALL;                                                       \
+       cpsie i;        /* local_irq_enable */                          \
+       adr lr, return_from_trap;                                       \
+       mov r0, sp;                                                     \
+       mov r11, sp;                                                    \
+       bic sp, #7; /* Align the stack pointer (noop on guest trap) */  \
        b do_trap_##trap
 
-#define DEFINE_TRAP_ENTRY_NOIRQ(trap)                                          
                        \
-       ALIGN;                                                                  
                        \
-trap_##trap:                                                                   
                        \
-       SAVE_ALL;                                                               
                        \
-       adr lr, return_from_trap;                                               
                        \
-       mov r0, sp;                                                             
                        \
-       mov r11, sp;                                                            
                        \
-       bic sp, #7; /* Align the stack pointer (noop on guest trap) */          
                        \
+#define DEFINE_TRAP_ENTRY_NOIRQ(trap)                                  \
+       ALIGN;                                                          \
+trap_##trap:                                                           \
+       SAVE_ALL;                                                       \
+       adr lr, return_from_trap;                                       \
+       mov r0, sp;                                                     \
+       mov r11, sp;                                                    \
+       bic sp, #7; /* Align the stack pointer (noop on guest trap) */  \
        b do_trap_##trap
 
 .globl hyp_traps_vector

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog