Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Thu, 21 Jun 2018 03:28:30 -0700
From:   tip-bot for Ingo Molnar <tipbot@zytor.com>
Message-ID: <tip-a449a5325528c1ef2c5efae0fa422bf1c4a270e6@git.kernel.org>
Cc:     mingo@kernel.org, linux-kernel@vger.kernel.org,
        torvalds@linux-foundation.org, hpa@zytor.com, peterz@infradead.org,
        tglx@linutronix.de, reinette.chatre@intel.com
Reply-To: linux-kernel@vger.kernel.org, mingo@kernel.org,
          torvalds@linux-foundation.org, hpa@zytor.com,
          peterz@infradead.org, reinette.chatre@intel.com,
          tglx@linutronix.de
In-Reply-To: <5773274f9947c4d8becbabd2655bd1628f060147.1529474468.git.reinette.chatre@intel.com>
References: <5773274f9947c4d8becbabd2655bd1628f060147.1529474468.git.reinette.chatre@intel.com>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:x86/cache] x86/intel_rdt: Simplify index type
Git-Commit-ID: a449a5325528c1ef2c5efae0fa422bf1c4a270e6
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> to get blacklisted from
 these emails
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Commit-ID:  a449a5325528c1ef2c5efae0fa422bf1c4a270e6
Gitweb:     https://git.kernel.org/tip/a449a5325528c1ef2c5efae0fa422bf1c4a270e6
Author:     Ingo Molnar <mingo@kernel.org>
AuthorDate: Tue, 19 Jun 2018 23:19:27 -0700
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Thu, 21 Jun 2018 11:21:35 +0200

x86/intel_rdt: Simplify index type

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 <tglx@linutronix.de>
Cc: Reinette Chatre <reinette.chatre@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: fenghua.yu@intel.com
Cc: hpa@zytor.com
Cc: tony.luck@intel.com
Fixes: 0438fb1aebf4 ("x86/intel_rdt: Pseudo-lock region creation/removal core")
Link: https://lkml.kernel.org/r/5773274f9947c4d8becbabd2655bd1628f060147.1529474468.git.reinette.chatre@intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 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