From: Natalie.Protasevich-GLv8BlqOqDDQT0dZR+AlfA@public.gmane.org
To: len.brown-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org
Cc: akpm-3NddpPZAyC0@public.gmane.org,
acpi-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org,
Natalie.Protasevich-GLv8BlqOqDDQT0dZR+AlfA@public.gmane.org
Subject: [patch 1/1] ES7000 broken build for non-ACPI config
Date: Thu, 25 Aug 2005 04:05:59 -0700 [thread overview]
Message-ID: <20050825110600.4382758DC5@linux.site> (raw)
Added #ifdefs in several places for items meant for ACPI boot only.
Moved es7000_plat global var outside of CONFIG_ACPI_BOOT scope, so it's
available for non-ACPI build.
Signed-off-by: <Natalie.Protasevich-GLv8BlqOqDDQT0dZR+AlfA@public.gmane.org>
---
arch/i386/kernel/mpparse.c | 4 ++--
arch/i386/mach-es7000/es7000.h | 2 ++
arch/i386/mach-es7000/es7000plat.c | 6 ++----
include/asm-i386/mach-es7000/mach_mpparse.h | 4 ++++
4 files changed, 10 insertions(+), 6 deletions(-)
diff -puN arch/i386/mach-es7000/es7000.h~build-fix-1 arch/i386/mach-es7000/es7000.h
--- linux-2.6.13-rc6/arch/i386/mach-es7000/es7000.h~build-fix-1 2005-08-25 00:57:54.998988192 -0700
+++ linux-2.6.13-rc6-root/arch/i386/mach-es7000/es7000.h 2005-08-25 00:58:39.812175552 -0700
@@ -74,6 +74,7 @@ struct es7000_oem_table {
struct psai psai;
};
+#ifdef CONFIG_ACPI_BOOT
struct acpi_table_sdt {
unsigned long pa;
unsigned long count;
@@ -89,6 +90,7 @@ struct oem_table {
u32 OEMTableAddr;
u32 OEMTableSize;
};
+#endif
struct mip_reg {
unsigned long long off_0;
diff -puN arch/i386/mach-es7000/es7000plat.c~build-fix-1 arch/i386/mach-es7000/es7000plat.c
--- linux-2.6.13-rc6/arch/i386/mach-es7000/es7000plat.c~build-fix-1 2005-08-25 00:57:55.033982872 -0700
+++ linux-2.6.13-rc6-root/arch/i386/mach-es7000/es7000plat.c 2005-08-25 00:59:26.518075176 -0700
@@ -51,8 +51,6 @@ struct mip_reg *host_reg;
int mip_port;
unsigned long mip_addr, host_addr;
-#if defined(CONFIG_X86_IO_APIC) && (defined(CONFIG_ACPI_INTERPRETER) || defined(CONFIG_ACPI_BOOT))
-
/*
* GSI override for ES7000 platforms.
*/
@@ -73,8 +71,6 @@ es7000_rename_gsi(int ioapic, int gsi)
return gsi;
}
-#endif // (CONFIG_X86_IO_APIC) && (CONFIG_ACPI_INTERPRETER || CONFIG_ACPI_BOOT)
-
/*
* Parse the OEM Table
*/
@@ -156,6 +152,7 @@ parse_unisys_oem (char *oemptr, int oem_
return es7000_plat;
}
+#ifdef CONFIG_ACPI_BOOT
int __init
find_unisys_acpi_oem_table(unsigned long *oem_addr, int *length)
{
@@ -210,6 +207,7 @@ find_unisys_acpi_oem_table(unsigned long
Dprintk("ES7000: did not find Unisys ACPI OEM table!\n");
return -1;
}
+#endif
static void
es7000_spin(int n)
diff -puN include/asm-i386/mach-es7000/mach_mpparse.h~build-fix-1 include/asm-i386/mach-es7000/mach_mpparse.h
--- linux-2.6.13-rc6/include/asm-i386/mach-es7000/mach_mpparse.h~build-fix-1 2005-08-25 01:30:43.906668728 -0700
+++ linux-2.6.13-rc6-root/include/asm-i386/mach-es7000/mach_mpparse.h 2005-08-25 01:31:35.785781904 -0700
@@ -13,7 +13,9 @@ static inline void mpc_oem_pci_bus(struc
}
extern int parse_unisys_oem (char *oemptr, int oem_entries);
+#ifdef CONFIG_ACPI_BOOT
extern int find_unisys_acpi_oem_table(unsigned long *oem_addr, int *length);
+#endif
static inline int mps_oem_check(struct mp_config_table *mpc, char *oem,
char *productid)
@@ -30,10 +32,12 @@ static inline int mps_oem_check(struct m
/* Hook from generic ACPI tables.c */
static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id)
{
+#ifdef CONFIG_ACPI_BOOT
unsigned long oem_addr;
int oem_entries;
if (!find_unisys_acpi_oem_table(&oem_addr, &oem_entries))
return parse_unisys_oem((char *)oem_addr, oem_entries);
+#endif
return 0;
}
diff -puN arch/i386/kernel/mpparse.c~build-fix-1 arch/i386/kernel/mpparse.c
--- linux-2.6.13-rc6/arch/i386/kernel/mpparse.c~build-fix-1 2005-08-25 01:50:46.237886600 -0700
+++ linux-2.6.13-rc6-root/arch/i386/kernel/mpparse.c 2005-08-25 01:51:57.733017688 -0700
@@ -812,6 +812,8 @@ void __init find_smp_config (void)
ACPI-based MP Configuration
-------------------------------------------------------------------------- */
+int es7000_plat;
+
#ifdef CONFIG_ACPI_BOOT
void __init mp_register_lapic_address (
@@ -982,8 +984,6 @@ void __init mp_override_legacy_irq (
return;
}
-int es7000_plat;
-
void __init mp_config_acpi_legacy_irqs (void)
{
struct mpc_config_intsrc intsrc;
_
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
next reply other threads:[~2005-08-25 11:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-08-25 11:05 Natalie.Protasevich-GLv8BlqOqDDQT0dZR+AlfA [this message]
-- strict thread matches above, loose matches on Subject: below --
2005-08-26 15:36 [patch 1/1] ES7000 broken build for non-ACPI config Brown, Len
2005-08-26 16:13 Protasevich, Natalie
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=20050825110600.4382758DC5@linux.site \
--to=natalie.protasevich-glv8blqoqddqt0dzr+alfa@public.gmane.org \
--cc=acpi-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org \
--cc=akpm-3NddpPZAyC0@public.gmane.org \
--cc=len.brown-ral2JQCrhuEAvxtiuMwx3w@public.gmane.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