diff options
| author | andrew <andrew@FreeBSD.org> | 2015-08-31 09:39:16 +0000 |
|---|---|---|
| committer | andrew <andrew@FreeBSD.org> | 2015-08-31 09:39:16 +0000 |
| commit | e11037aa016dae2af9b9276da67d194c6384890f (patch) | |
| tree | 344c1c77a276c1d1bc62490b89a473095b5816a7 | |
| parent | dcb3f834f3581b35f79a063d4602532c9fb9d529 (diff) | |
| download | FreeBSD-src-e11037aa016dae2af9b9276da67d194c6384890f.zip FreeBSD-src-e11037aa016dae2af9b9276da67d194c6384890f.tar.gz | |
Clean up the style of the LEAVE_HYP macro.
| -rw-r--r-- | sys/arm/arm/locore-v6.S | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sys/arm/arm/locore-v6.S b/sys/arm/arm/locore-v6.S index 7990f28..5a52228 100644 --- a/sys/arm/arm/locore-v6.S +++ b/sys/arm/arm/locore-v6.S @@ -67,23 +67,23 @@ __FBSDID("$FreeBSD$"); .align 2 #if __ARM_ARCH >= 7 -#define LEAVE_HYP \ - /* Leave HYP mode */ ;\ - mrs r0, cpsr ;\ - and r0, r0, #(PSR_MODE) /* Mode is in the low 5 bits of CPSR */ ;\ - teq r0, #(PSR_HYP32_MODE) /* Hyp Mode? */ ;\ - bne 1f ;\ - /* Ensure that IRQ, FIQ and Aborts will be disabled after eret */;\ - mrs r0, spsr ;\ - orr r0, r0, #(PSR_I | PSR_F | PSR_A) ;\ - msr spsr, r0 ;\ - /* Exit hypervisor mode */ ;\ - adr lr, 1f ;\ - MSR_ELR_HYP(14) ;\ - ERET ;\ +#define LEAVE_HYP \ + /* Leave HYP mode */ ;\ + mrs r0, cpsr ;\ + and r0, r0, #(PSR_MODE) /* Mode is in the low 5 bits of CPSR */ ;\ + teq r0, #(PSR_HYP32_MODE) /* Hyp Mode? */ ;\ + bne 1f ;\ + /* Ensure that IRQ, FIQ and Aborts will be disabled after eret */ ;\ + mrs r0, spsr ;\ + orr r0, r0, #(PSR_I | PSR_F | PSR_A) ;\ + msr spsr, r0 ;\ + /* Exit hypervisor mode */ ;\ + adr lr, 1f ;\ + MSR_ELR_HYP(14) ;\ + ERET ;\ 1: #else -#define LEAVE_HYP +#define LEAVE_HYP #endif /* __ARM_ARCH >= 7 */ /* |
