Commit f4138de5 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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



Also fix some nearby whitespace damage while at it.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarPeter 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>
parent dfe2574c

arch/x86/include/asm/msr-index.h

+6 −6
Original line number Diff line number Diff line
@@ -545,13 +545,13 @@ 
#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)