From: Alex Chiang <achiang@hp.com>
To: lenb@kernel.org
Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 11/12] ACPI: processor: push file static MADT pointer into internal map_madt_entry()
Date: Mon, 25 Jan 2010 14:41:34 -0700 [thread overview]
Message-ID: <20100125214134.28510.81625.stgit@bob.kio> (raw)
In-Reply-To: <20100125213221.28510.74078.stgit@bob.kio>
There's no real need for a pointer to the MADT to be global. The only
function who uses it is map_madt_entry.
This allows us to remove some more ugly #ifdefs.
Signed-off-by: Alex Chiang <achiang@hp.com>
---
drivers/acpi/processor_core.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index ec5989c..ae69f6d 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -43,8 +43,6 @@ static struct dmi_system_id __cpuinitdata processor_idle_dmi_table[] = {
};
#ifdef CONFIG_SMP
-static struct acpi_table_madt *madt;
-
static int map_lapic_id(struct acpi_subtable_header *entry,
u32 acpi_id, int *apic_id)
{
@@ -100,8 +98,17 @@ static int map_lsapic_id(struct acpi_subtable_header *entry,
static int map_madt_entry(int type, u32 acpi_id)
{
unsigned long madt_end, entry;
+ static struct acpi_table_madt *madt;
+ static int read_madt;
int apic_id = -1;
+ if (!read_madt) {
+ if (ACPI_FAILURE(acpi_get_table(ACPI_SIG_MADT, 0,
+ (struct acpi_table_header **)&madt)))
+ madt = NULL;
+ read_madt++;
+ }
+
if (!madt)
return apic_id;
@@ -335,13 +342,6 @@ early_init_pdc(acpi_handle handle, u32 lvl, void *context, void **rv)
void acpi_early_processor_set_pdc(void)
{
-
-#ifdef CONFIG_SMP
- if (ACPI_FAILURE(acpi_get_table(ACPI_SIG_MADT, 0,
- (struct acpi_table_header **)&madt)))
- madt = NULL;
-#endif
-
/*
* Check whether the system is DMI table. If yes, OSPM
* should not use mwait for CPU-states.
next prev parent reply other threads:[~2010-01-25 21:41 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-25 21:40 [PATCH 00/12] ACPI: processor driver vs. core Alex Chiang
2010-01-25 21:40 ` [PATCH 01/12] ACPI: processor: mv processor_core.c processor_driver.c Alex Chiang
2010-01-25 21:40 ` [PATCH 02/12] ACPI: processor: mv processor_pdc.c processor_core.c Alex Chiang
2010-01-25 21:40 ` [PATCH 03/12] ACPI: processor: export acpi_get_cpuid() Alex Chiang
2010-01-25 21:40 ` [PATCH 04/12] ACPI: processor: move acpi_get_cpuid into processor_core.c Alex Chiang
2010-01-25 21:41 ` [PATCH 05/12] ACPI: processor: add internal processor_physically_present() Alex Chiang
2010-01-25 21:41 ` [PATCH 06/12] ACPI: processor: remove early _PDC optin quirks Alex Chiang
2010-01-25 21:41 ` [PATCH 07/12] ACPI: processor: driver doesn't need to evaluate _PDC Alex Chiang
2010-01-25 21:41 ` [PATCH 08/12] ACPI: processor: refactor internal map_lapic_id() Alex Chiang
2010-01-25 21:41 ` [PATCH 09/12] ACPI: processor: refactor internal map_x2apic_id() Alex Chiang
2010-01-25 21:41 ` [PATCH 10/12] ACPI: processor: refactor internal map_lsapic_id() Alex Chiang
2010-01-25 22:22 ` David Rientjes
2010-01-25 22:46 ` Alex Chiang
2010-01-25 21:41 ` Alex Chiang [this message]
2010-01-25 21:41 ` [PATCH 12/12] ACPI: processor core: style and sparse cleanups Alex Chiang
2010-02-02 23:17 ` [PATCH 00/12] ACPI: processor driver vs. core Alex Chiang
2010-02-03 1:51 ` Pallipadi, Venkatesh
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=20100125214134.28510.81625.stgit@bob.kio \
--to=achiang@hp.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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