diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-30 12:38:28 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-30 12:38:28 +0200 |
commit | d7e25c66c9bf882450060fd9464e784bd229d3ae (patch) | |
tree | 0fb9525f91b11226a5a4b861cefd9fc5679f5c9b /arch/mips/include/asm/mach-cavium-octeon/mangle-port.h | |
parent | 907241dccb4ce5d9413cf3c030b32b0cfc184914 (diff) | |
parent | e4aad64597d7a2455a541f904365b48d607916db (diff) |
Merge branch 'x86/urgent' into x86/asm
Get the cr4 fixes so we can apply the final cleanup
Diffstat (limited to 'arch/mips/include/asm/mach-cavium-octeon/mangle-port.h')
-rw-r--r-- | arch/mips/include/asm/mach-cavium-octeon/mangle-port.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/include/asm/mach-cavium-octeon/mangle-port.h b/arch/mips/include/asm/mach-cavium-octeon/mangle-port.h index 0cf5ac1f7245..8ff2cbdf2c3e 100644 --- a/arch/mips/include/asm/mach-cavium-octeon/mangle-port.h +++ b/arch/mips/include/asm/mach-cavium-octeon/mangle-port.h @@ -15,8 +15,8 @@ static inline bool __should_swizzle_bits(volatile void *a) { extern const bool octeon_should_swizzle_table[]; + u64 did = ((u64)(uintptr_t)a >> 40) & 0xff; - unsigned long did = ((unsigned long)a >> 40) & 0xff; return octeon_should_swizzle_table[did]; } @@ -29,7 +29,7 @@ static inline bool __should_swizzle_bits(volatile void *a) #define __should_swizzle_bits(a) false -static inline bool __should_swizzle_addr(unsigned long p) +static inline bool __should_swizzle_addr(u64 p) { /* boot bus? */ return ((p >> 40) & 0xff) == 0; |