x86/msr: Standardize on u64 in <asm/msr-index.h>

Also fix some nearby whitespace damage while at it.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Juergen Gross <jgross@suse.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Xin Li <xin@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
index e6134ef2263d50d146ac5d37df129ba1a19150b6..e0d60805b86950838546b4a08fad7ba195fd4088 100644 (file)
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@ -525,7 +525,7 @@
 #define MSR_HWP_CAPABILITIES           0x00000771
 #define MSR_HWP_REQUEST_PKG            0x00000772
 #define MSR_HWP_INTERRUPT              0x00000773
-#define MSR_HWP_REQUEST                0x00000774
+#define MSR_HWP_REQUEST                        0x00000774
 #define MSR_HWP_STATUS                 0x00000777
 
 /* CPUID.6.EAX */
@@ -542,16 +542,16 @@
 #define HWP_LOWEST_PERF(x)             (((x) >> 24) & 0xff)
 
 /* IA32_HWP_REQUEST */
-#define HWP_MIN_PERF(x)                (x & 0xff)
-#define HWP_MAX_PERF(x)                ((x & 0xff) << 8)
+#define HWP_MIN_PERF(x)                        (x & 0xff)
+#define HWP_MAX_PERF(x)                        ((x & 0xff) << 8)
 #define HWP_DESIRED_PERF(x)            ((x & 0xff) << 16)
-#define HWP_ENERGY_PERF_PREFERENCE(x)  (((unsigned long long) x & 0xff) << 24)
+#define HWP_ENERGY_PERF_PREFERENCE(x)  (((u64)x & 0xff) << 24)
 #define HWP_EPP_PERFORMANCE            0x00
 #define HWP_EPP_BALANCE_PERFORMANCE    0x80
 #define HWP_EPP_BALANCE_POWERSAVE      0xC0
 #define HWP_EPP_POWERSAVE              0xFF
-#define HWP_ACTIVITY_WINDOW(x)         ((unsigned long long)(x & 0xff3) << 32)
-#define HWP_PACKAGE_CONTROL(x)         ((unsigned long long)(x & 0x1) << 42)
+#define HWP_ACTIVITY_WINDOW(x)         ((u64)(x & 0xff3) << 32)
+#define HWP_PACKAGE_CONTROL(x)         ((u64)(x & 0x1) << 42)
 
 /* IA32_HWP_STATUS */
 #define HWP_GUARANTEED_CHANGE(x)       (x & 0x1)