From: Ingo Molnar <[email protected]>
Simplify this pattern:
#ifdef CONFIG_X86_64
u64 i;
#else
u32 i;
#endif
... to the more natural and shorter one:
unsigned long i;
No change in functionality.
Acked-by Thomas Gleixner <[email protected]>
Cc: Reinette Chatre <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Fixes: 0438fb1aebf4 ("x86/intel_rdt: Pseudo-lock region creation/removal core")
Link:
https://lkml.kernel.org/r/5773274f9947c4d8becbabd2655bd1628f060147.1529474468.git.reinette.cha...@intel.com
Signed-off-by: Ingo Molnar <[email protected]>
---
arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c
b/arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c
index a1670e50d6ce..df68972d5e3e 100644
--- a/arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c
+++ b/arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c
@@ -415,11 +415,7 @@ static int pseudo_lock_fn(void *_rdtgrp)
struct rdtgroup *rdtgrp = _rdtgrp;
struct pseudo_lock_region *plr = rdtgrp->plr;
u32 rmid_p, closid_p;
-#ifdef CONFIG_X86_64
- u64 i;
-#else
- u32 i;
-#endif
+ unsigned long i;
#ifdef CONFIG_KASAN
/*
* The registers used for local register variables are also used
@@ -874,11 +870,7 @@ static int measure_cycles_lat_fn(void *_plr)
{
struct pseudo_lock_region *plr = _plr;
u64 start, end;
-#ifdef CONFIG_X86_64
- u64 i;
-#else
- u32 i;
-#endif
+ unsigned long i;
#ifdef CONFIG_KASAN
/*
* The registers used for local register variables are also used
@@ -932,11 +924,7 @@ static int measure_cycles_perf_fn(void *_plr)
struct pseudo_lock_region *plr = _plr;
unsigned long long l2_hits, l2_miss;
u64 l2_hit_bits, l2_miss_bits;
-#ifdef CONFIG_X86_64
- u64 i;
-#else
- u32 i;
-#endif
+ unsigned long i;
#ifdef CONFIG_KASAN
/*
* The registers used for local register variables are also used
--
2.17.0
