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:   Mon, 10 Jun 2019 13:52:11 -0700
From:   tip-bot for Uros Bizjak <tipbot@zytor.com>
Message-ID: <tip-515f0453752e3daba7c47d37d9172a66509a56fd@git.kernel.org>
Cc:     linux-kernel@vger.kernel.org, mingo@kernel.org, x86@kernel.org,
        bp@suse.de, reinette.chatre@intel.com, mingo@redhat.com,
        ubizjak@gmail.com, tglx@linutronix.de, hpa@zytor.com,
        fenghua.yu@intel.com
Reply-To: fenghua.yu@intel.com, hpa@zytor.com, tglx@linutronix.de,
          ubizjak@gmail.com, reinette.chatre@intel.com, mingo@redhat.com,
          bp@suse.de, x86@kernel.org, mingo@kernel.org,
          linux-kernel@vger.kernel.org
In-Reply-To: <20190606200044.5730-1-ubizjak@gmail.com>
References: <20190606200044.5730-1-ubizjak@gmail.com>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:x86/cache] x86/resctrl: Use _ASM_BX to avoid ifdeffery
Git-Commit-ID: 515f0453752e3daba7c47d37d9172a66509a56fd
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:  515f0453752e3daba7c47d37d9172a66509a56fd
Gitweb:     https://git.kernel.org/tip/515f0453752e3daba7c47d37d9172a66509a56fd
Author:     Uros Bizjak <ubizjak@gmail.com>
AuthorDate: Thu, 6 Jun 2019 22:00:44 +0200
Committer:  Borislav Petkov <bp@suse.de>
CommitDate: Mon, 10 Jun 2019 22:36:38 +0200

x86/resctrl: Use _ASM_BX to avoid ifdeffery

Use the _ASM_BX macro which expands to either %rbx or %ebx, depending on
the 32-bit or 64-bit config selected.

Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Reinette Chatre <reinette.chatre@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/20190606200044.5730-1-ubizjak@gmail.com
---
 arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/arch/x86/kernel/cpu/resctrl/pseudo_lock.c b/arch/x86/kernel/cpu/resctrl/pseudo_lock.c
index 604c0e3bcc83..09408794eab2 100644
--- a/arch/x86/kernel/cpu/resctrl/pseudo_lock.c
+++ b/arch/x86/kernel/cpu/resctrl/pseudo_lock.c
@@ -431,11 +431,7 @@ static int pseudo_lock_fn(void *_rdtgrp)
 #else
 	register unsigned int line_size asm("esi");
 	register unsigned int size asm("edi");
-#ifdef CONFIG_X86_64
-	register void *mem_r asm("rbx");
-#else
-	register void *mem_r asm("ebx");
-#endif /* CONFIG_X86_64 */
+	register void *mem_r asm(_ASM_BX);
 #endif /* CONFIG_KASAN */
 
 	/*