diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-10-15 21:54:05 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-15 21:54:05 +0200 |
| commit | f88839ddbe68ed28471ac0b0ec2c338ffa3f970f (patch) | |
| tree | 5124a642410c5ea6983f0a94bb6d12c86a5d0333 | |
| parent | 064ca93f7ab927c2752d86fc5727716e340d737c (diff) | |
| parent | 7ee20ff0072154d326c86223fbb88d23aa152b91 (diff) | |
Merge tag 'mvebu-cleanup-4.4-1' of git://git.infradead.org/linux-mvebu into next/cleanup
Merge "mvebu cleanup for 4.4 (part 1)" from Gregory CLEMENT:
use the CR_C define instead of a literal value
* tag 'mvebu-cleanup-4.4-1' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: Use a CR_C constant instead of a hard-coded one
| -rw-r--r-- | arch/arm/mach-mvebu/pmsu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mvebu/pmsu.c b/arch/arm/mach-mvebu/pmsu.c index e8fdb9ceedf0..9658b5a11e38 100644 --- a/arch/arm/mach-mvebu/pmsu.c +++ b/arch/arm/mach-mvebu/pmsu.c @@ -296,11 +296,11 @@ int armada_370_xp_pmsu_idle_enter(unsigned long deepidle) /* Test the CR_C bit and set it if it was cleared */ asm volatile( "mrc p15, 0, r0, c1, c0, 0 \n\t" - "tst r0, #(1 << 2) \n\t" + "tst r0, %0 \n\t" "orreq r0, r0, #(1 << 2) \n\t" "mcreq p15, 0, r0, c1, c0, 0 \n\t" "isb " - : : : "r0"); + : : "Ir" (CR_C) : "r0"); pr_debug("Failed to suspend the system\n"); |