linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yinghai Lu <yinghai@kernel.org>
To: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>,
	"H. Peter Anvin" <hpa@zytor.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	"Eric W. Biederman" <ebiederm@xmission.com>,
	linux-kernel@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 08/10] x86: !find_smp_config path use smp_register_lapic_address
Date: Fri,  6 Aug 2010 19:15:41 -0700	[thread overview]
Message-ID: <1281147343-18389-9-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1281147343-18389-1-git-send-email-yinghai@kernel.org>

so fixmap will be setup there.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
 arch/x86/kernel/apic/apic.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 3d3d3da..2c9aa63 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1477,7 +1477,7 @@ static int __init detect_init_APIC(void)
 		return -1;
 	}
 
-	mp_lapic_addr = APIC_DEFAULT_PHYS_BASE;
+	smp_register_lapic_addr(APIC_DEFAULT_PHYS_BASE);
 	return 0;
 }
 #else
@@ -1487,6 +1487,7 @@ static int __init detect_init_APIC(void)
 static int __init detect_init_APIC(void)
 {
 	u32 h, l, features;
+	unsigned long lapic_addr;
 
 	/* Disabled by kernel option? */
 	if (disable_apic)
@@ -1541,13 +1542,14 @@ static int __init detect_init_APIC(void)
 		return -1;
 	}
 	set_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);
-	mp_lapic_addr = APIC_DEFAULT_PHYS_BASE;
+	lapic_addr = APIC_DEFAULT_PHYS_BASE;
 
 	/* The BIOS may have set up the APIC at some other address */
 	rdmsr(MSR_IA32_APICBASE, l, h);
 	if (l & MSR_IA32_APICBASE_ENABLE)
-		mp_lapic_addr = l & MSR_IA32_APICBASE_BASE;
+		lapic_addr = l & MSR_IA32_APICBASE_BASE;
 
+	smp_register_lapic_address(lapic_addr)
 	pr_info("Found and enabled local APIC!\n");
 
 	apic_pm_activate();
-- 
1.6.4.2


  parent reply	other threads:[~2010-08-07  2:18 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-07  2:15 [PATCH 00/10] x86: clean up using smp_register_lapic_address() Yinghai Lu
2010-08-07  2:15 ` [PATCH 01/10] x86: Fix lapic mapping with construct ISA and visws mptable path Yinghai Lu
2010-08-07  2:15 ` [PATCH 02/10] x86, acpi: merge two register_lapic_address() Yinghai Lu
2010-08-07  2:15 ` [PATCH 03/10] x86: remove early_init_lapic_mapping Yinghai Lu
2010-08-07  2:15 ` [PATCH 04/10] x86: call smp_register_lapic_address for contruct_default mptable path Yinghai Lu
2010-08-07  2:15 ` [PATCH 05/10] x86, apic: use smp_register_lapic_address in init_apic_mapping Yinghai Lu
2010-08-07  2:15 ` [PATCH 06/10] x86, sfi: used smp_register_lapic_address Yinghai Lu
2010-08-07  2:15 ` [PATCH 07/10] x86,visws: set_fixmap in find_smp_config Yinghai Lu
2010-08-07  2:15 ` Yinghai Lu [this message]
2010-08-07  2:15 ` [PATCH 09/10] x86, apic: set fixmap only one time Yinghai Lu
2010-08-07  2:15 ` [PATCH 10/10] x86, ioapic: only print mapping for ioapic in right place Yinghai Lu
2010-08-14 20:35 ` [PATCH -v2 08/10] x86: !find_smp_config path use smp_register_lapic_address Yinghai Lu

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=1281147343-18389-9-git-send-email-yinghai@kernel.org \
    --to=yinghai@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=ebiederm@xmission.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --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;
as well as URLs for NNTP newsgroup(s).