From: tip-bot for Dou Liyang <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org,
douly.fnst@cn.fujitsu.com, linux-kernel@vger.kernel.org
Subject: [tip:x86/apic] x86/apic: Drop logical_smp_processor_id() inline
Date: Thu, 1 Mar 2018 01:17:28 -0800 [thread overview]
Message-ID: <tip-8f1561680f42a5491b371b513f1ab8197f31fd62@git.kernel.org> (raw)
In-Reply-To: <20180301055930.2396-4-douly.fnst@cn.fujitsu.com>
Commit-ID: 8f1561680f42a5491b371b513f1ab8197f31fd62
Gitweb: https://git.kernel.org/tip/8f1561680f42a5491b371b513f1ab8197f31fd62
Author: Dou Liyang <douly.fnst@cn.fujitsu.com>
AuthorDate: Thu, 1 Mar 2018 13:59:30 +0800
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Thu, 1 Mar 2018 10:12:21 +0100
x86/apic: Drop logical_smp_processor_id() inline
The logical_smp_processor_id() inline which is only called in
setup_local_APIC() on x86_32 systems has no real value.
Drop it and directly use GET_APIC_LOGICAL_ID() at the call site and use a
more suitable variable name for readability
Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: andy.shevchenko@gmail.com
Cc: bhe@redhat.com
Cc: ebiederm@xmission.com
Link: https://lkml.kernel.org/r/20180301055930.2396-4-douly.fnst@cn.fujitsu.com
---
arch/x86/include/asm/smp.h | 10 ----------
arch/x86/kernel/apic/apic.c | 10 +++++-----
2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index 461f53d27708..e2057780d67f 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -176,16 +176,6 @@ static inline int wbinvd_on_all_cpus(void)
extern unsigned disabled_cpus;
#ifdef CONFIG_X86_LOCAL_APIC
-
-#ifndef CONFIG_X86_64
-static inline int logical_smp_processor_id(void)
-{
- /* we don't want to mark this access volatile - bad code generation */
- return GET_APIC_LOGICAL_ID(apic_read(APIC_LDR));
-}
-
-#endif
-
extern int hard_smp_processor_id(void);
#else /* CONFIG_X86_LOCAL_APIC */
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 7a347d7450b6..ce2066373922 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1468,7 +1468,7 @@ static void setup_local_APIC(void)
int cpu = smp_processor_id();
unsigned int value;
#ifdef CONFIG_X86_32
- int i;
+ int logical_apicid, ldr_apicid;
#endif
@@ -1507,11 +1507,11 @@ static void setup_local_APIC(void)
* initialized during get_smp_config(), make sure it matches the
* actual value.
*/
- i = early_per_cpu(x86_cpu_to_logical_apicid, cpu);
- WARN_ON(i != BAD_APICID && i != logical_smp_processor_id());
+ logical_apicid = early_per_cpu(x86_cpu_to_logical_apicid, cpu);
+ ldr_apicid = GET_APIC_LOGICAL_ID(apic_read(APIC_LDR));
+ WARN_ON(logical_apicid != BAD_APICID && logical_apicid != ldr_apicid);
/* always use the value from LDR */
- early_per_cpu(x86_cpu_to_logical_apicid, cpu) =
- logical_smp_processor_id();
+ early_per_cpu(x86_cpu_to_logical_apicid, cpu) = ldr_apicid;
#endif
/*
prev parent reply other threads:[~2018-03-01 9:17 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-01 5:59 [PATCH v5 0/3] Make setup_local_APIC() clear Dou Liyang
2018-03-01 5:59 ` [PATCH v5 1/3] x86/apic: Move pending intr check code into it's own function Dou Liyang
2018-03-01 9:16 ` [tip:x86/apic] x86/apic: Move pending interrupt " tip-bot for Dou Liyang
2018-03-01 5:59 ` [PATCH v5 2/3] x86/apic: Replace common tools with new ones Dou Liyang
2018-03-01 9:17 ` [tip:x86/apic] x86/apic: Modernize the pending interrupt code tip-bot for Dou Liyang
2018-03-01 5:59 ` [PATCH v5 3/3] x86/apic: Drop the logical_smp_processor_id() Dou Liyang
2018-03-01 9:17 ` tip-bot for Dou Liyang [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-8f1561680f42a5491b371b513f1ab8197f31fd62@git.kernel.org \
--to=tipbot@zytor.com \
--cc=douly.fnst@cn.fujitsu.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox