mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@elte.hu>
To: linux-kernel@vger.kernel.org
Cc: "H. Peter Anvin" <hpa@zytor.com>,
	Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>
Subject: [PATCH 075/114] x86: remove mach_apic.h
Date: Wed, 28 Jan 2009 23:42:21 +0000	[thread overview]
Message-ID: <1233186180-29883-76-git-send-email-mingo@elte.hu> (raw)
In-Reply-To: <1233186180-29883-1-git-send-email-mingo@elte.hu>

Spread mach_apic.h definitions into genapic.h. (with some knock-on effects
on smp.h and apic.h.)

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 arch/x86/include/asm/apic.h                   |    2 +-
 arch/x86/include/asm/genapic.h                |  139 ++++++++++++++++++++++++
 arch/x86/include/asm/mach-default/mach_apic.h |  144 -------------------------
 arch/x86/include/asm/mach-generic/mach_apic.h |    8 --
 arch/x86/include/asm/smp.h                    |   19 ----
 arch/x86/kernel/acpi/boot.c                   |   14 +---
 arch/x86/kernel/apic.c                        |   22 ++++-
 arch/x86/kernel/cpu/addon_cpuid_features.c    |    2 +-
 arch/x86/kernel/cpu/amd.c                     |    2 +-
 arch/x86/kernel/cpu/common.c                  |    2 +-
 arch/x86/kernel/cpu/intel.c                   |    2 +-
 arch/x86/kernel/io_apic.c                     |    2 +-
 arch/x86/kernel/ipi.c                         |    2 +-
 arch/x86/kernel/irq_32.c                      |    2 +-
 arch/x86/kernel/mpparse.c                     |    3 +-
 arch/x86/kernel/setup.c                       |    2 +-
 arch/x86/kernel/smp.c                         |    2 +-
 arch/x86/kernel/smpboot.c                     |    2 +-
 arch/x86/kernel/tlb_uv.c                      |    2 +-
 arch/x86/kernel/visws_quirks.c                |    2 +-
 arch/x86/mach-generic/default.c               |    2 +-
 arch/x86/mach-generic/probe.c                 |    5 -
 22 files changed, 175 insertions(+), 207 deletions(-)
 delete mode 100644 arch/x86/include/asm/mach-default/mach_apic.h
 delete mode 100644 arch/x86/include/asm/mach-generic/mach_apic.h

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 3a32020..6a77068 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -215,7 +215,7 @@ static inline void disable_local_APIC(void) { }
 #define	SET_APIC_ID(x)		(apic->set_apic_id(x))
 #else
 
-static inline unsigned default_get_apic_id(unsigned long x) 
+static inline unsigned default_get_apic_id(unsigned long x)
 {
 	unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR));
 
diff --git a/arch/x86/include/asm/genapic.h b/arch/x86/include/asm/genapic.h
index 1772dad..ce3655a 100644
--- a/arch/x86/include/asm/genapic.h
+++ b/arch/x86/include/asm/genapic.h
@@ -120,4 +120,143 @@ static inline void default_wait_for_init_deassert(atomic_t *deassert)
 	return;
 }
 
+extern void generic_bigsmp_probe(void);
+
+
+#ifdef CONFIG_X86_LOCAL_APIC
+
+#include <asm/smp.h>
+
+#define APIC_DFR_VALUE	(APIC_DFR_FLAT)
+
+static inline const struct cpumask *default_target_cpus(void)
+{
+#ifdef CONFIG_SMP
+	return cpu_online_mask;
+#else
+	return cpumask_of(0);
+#endif
+}
+
+DECLARE_EARLY_PER_CPU(u16, x86_bios_cpu_apicid);
+
+
+static inline unsigned int read_apic_id(void)
+{
+	unsigned int reg;
+
+	reg = *(u32 *)(APIC_BASE + APIC_ID);
+
+	return apic->get_apic_id(reg);
+}
+
+#ifdef CONFIG_X86_64
+extern void default_setup_apic_routing(void);
+#else
+
+/*
+ * Set up the logical destination ID.
+ *
+ * Intel recommends to set DFR, LDR and TPR before enabling
+ * an APIC.  See e.g. "AP-388 82489DX User's Manual" (Intel
+ * document number 292116).  So here it goes...
+ */
+extern void default_init_apic_ldr(void);
+
+static inline int default_apic_id_registered(void)
+{
+	return physid_isset(read_apic_id(), phys_cpu_present_map);
+}
+
+static inline unsigned int
+default_cpu_mask_to_apicid(const struct cpumask *cpumask)
+{
+	return cpumask_bits(cpumask)[0];
+}
+
+static inline unsigned int
+default_cpu_mask_to_apicid_and(const struct cpumask *cpumask,
+			       const struct cpumask *andmask)
+{
+	unsigned long mask1 = cpumask_bits(cpumask)[0];
+	unsigned long mask2 = cpumask_bits(andmask)[0];
+	unsigned long mask3 = cpumask_bits(cpu_online_mask)[0];
+
+	return (unsigned int)(mask1 & mask2 & mask3);
+}
+
+static inline int default_phys_pkg_id(int cpuid_apic, int index_msb)
+{
+	return cpuid_apic >> index_msb;
+}
+
+static inline void default_setup_apic_routing(void)
+{
+#ifdef CONFIG_X86_IO_APIC
+	printk("Enabling APIC mode:  %s.  Using %d I/O APICs\n",
+					"Flat", nr_ioapics);
+#endif
+}
+
+extern int default_apicid_to_node(int logical_apicid);
+
+#endif
+
+static inline unsigned long default_check_apicid_used(physid_mask_t bitmap, int apicid)
+{
+	return physid_isset(apicid, bitmap);
+}
+
+static inline unsigned long default_check_apicid_present(int bit)
+{
+	return physid_isset(bit, phys_cpu_present_map);
+}
+
+static inline physid_mask_t default_ioapic_phys_id_map(physid_mask_t phys_map)
+{
+	return phys_map;
+}
+
+/* Mapping from cpu number to logical apicid */
+static inline int default_cpu_to_logical_apicid(int cpu)
+{
+	return 1 << cpu;
+}
+
+static inline int __default_cpu_present_to_apicid(int mps_cpu)
+{
+	if (mps_cpu < nr_cpu_ids && cpu_present(mps_cpu))
+		return (int)per_cpu(x86_bios_cpu_apicid, mps_cpu);
+	else
+		return BAD_APICID;
+}
+
+static inline int
+__default_check_phys_apicid_present(int boot_cpu_physical_apicid)
+{
+	return physid_isset(boot_cpu_physical_apicid, phys_cpu_present_map);
+}
+
+#ifdef CONFIG_X86_32
+static inline int default_cpu_present_to_apicid(int mps_cpu)
+{
+	return __default_cpu_present_to_apicid(mps_cpu);
+}
+
+static inline int
+default_check_phys_apicid_present(int boot_cpu_physical_apicid)
+{
+	return __default_check_phys_apicid_present(boot_cpu_physical_apicid);
+}
+#else
+extern int default_cpu_present_to_apicid(int mps_cpu);
+extern int default_check_phys_apicid_present(int boot_cpu_physical_apicid);
+#endif
+
+static inline physid_mask_t default_apicid_to_cpu_present(int phys_apicid)
+{
+	return physid_mask_of_physid(phys_apicid);
+}
+
+#endif /* CONFIG_X86_LOCAL_APIC */
 #endif /* _ASM_X86_GENAPIC_64_H */
diff --git a/arch/x86/include/asm/mach-default/mach_apic.h b/arch/x86/include/asm/mach-default/mach_apic.h
deleted file mode 100644
index bae053c..0000000
--- a/arch/x86/include/asm/mach-default/mach_apic.h
+++ /dev/null
@@ -1,144 +0,0 @@
-#ifndef _ASM_X86_MACH_DEFAULT_MACH_APIC_H
-#define _ASM_X86_MACH_DEFAULT_MACH_APIC_H
-
-#ifdef CONFIG_X86_LOCAL_APIC
-
-#include <asm/smp.h>
-
-#define APIC_DFR_VALUE	(APIC_DFR_FLAT)
-
-static inline const struct cpumask *default_target_cpus(void)
-{ 
-#ifdef CONFIG_SMP
-	return cpu_online_mask;
-#else
-	return cpumask_of(0);
-#endif
-} 
-
-#ifdef CONFIG_X86_64
-#include <asm/genapic.h>
-#define read_apic_id()  (apic->get_apic_id(apic_read(APIC_ID)))
-extern void default_setup_apic_routing(void);
-#else
-/*
- * Set up the logical destination ID.
- *
- * Intel recommends to set DFR, LDR and TPR before enabling
- * an APIC.  See e.g. "AP-388 82489DX User's Manual" (Intel
- * document number 292116).  So here it goes...
- */
-static inline void default_init_apic_ldr(void)
-{
-	unsigned long val;
-
-	apic_write(APIC_DFR, APIC_DFR_VALUE);
-	val = apic_read(APIC_LDR) & ~APIC_LDR_MASK;
-	val |= SET_APIC_LOGICAL_ID(1UL << smp_processor_id());
-	apic_write(APIC_LDR, val);
-}
-
-static inline int default_apic_id_registered(void)
-{
-	return physid_isset(read_apic_id(), phys_cpu_present_map);
-}
-
-static inline unsigned int
-default_cpu_mask_to_apicid(const struct cpumask *cpumask)
-{
-	return cpumask_bits(cpumask)[0];
-}
-
-static inline unsigned int
-default_cpu_mask_to_apicid_and(const struct cpumask *cpumask,
-			       const struct cpumask *andmask)
-{
-	unsigned long mask1 = cpumask_bits(cpumask)[0];
-	unsigned long mask2 = cpumask_bits(andmask)[0];
-	unsigned long mask3 = cpumask_bits(cpu_online_mask)[0];
-
-	return (unsigned int)(mask1 & mask2 & mask3);
-}
-
-static inline int default_phys_pkg_id(int cpuid_apic, int index_msb)
-{
-	return cpuid_apic >> index_msb;
-}
-
-static inline void default_setup_apic_routing(void)
-{
-#ifdef CONFIG_X86_IO_APIC
-	printk("Enabling APIC mode:  %s.  Using %d I/O APICs\n",
-					"Flat", nr_ioapics);
-#endif
-}
-
-static inline int default_apicid_to_node(int logical_apicid)
-{
-#ifdef CONFIG_SMP
-	return apicid_2_node[hard_smp_processor_id()];
-#else
-	return 0;
-#endif
-}
-
-#endif
-
-static inline unsigned long default_check_apicid_used(physid_mask_t bitmap, int apicid)
-{
-	return physid_isset(apicid, bitmap);
-}
-
-static inline unsigned long default_check_apicid_present(int bit)
-{
-	return physid_isset(bit, phys_cpu_present_map);
-}
-
-static inline physid_mask_t default_ioapic_phys_id_map(physid_mask_t phys_map)
-{
-	return phys_map;
-}
-
-/* Mapping from cpu number to logical apicid */
-static inline int default_cpu_to_logical_apicid(int cpu)
-{
-	return 1 << cpu;
-}
-
-static inline int __default_cpu_present_to_apicid(int mps_cpu)
-{
-	if (mps_cpu < nr_cpu_ids && cpu_present(mps_cpu))
-		return (int)per_cpu(x86_bios_cpu_apicid, mps_cpu);
-	else
-		return BAD_APICID;
-}
-
-static inline int
-__default_check_phys_apicid_present(int boot_cpu_physical_apicid)
-{
-	return physid_isset(boot_cpu_physical_apicid, phys_cpu_present_map);
-}
-
-#ifdef CONFIG_X86_32
-static inline int default_cpu_present_to_apicid(int mps_cpu)
-{
-	return __default_cpu_present_to_apicid(mps_cpu);
-}
-
-static inline int
-default_check_phys_apicid_present(int boot_cpu_physical_apicid)
-{
-	return __default_check_phys_apicid_present(boot_cpu_physical_apicid);
-}
-#else
-extern int default_cpu_present_to_apicid(int mps_cpu);
-extern int default_check_phys_apicid_present(int boot_cpu_physical_apicid);
-#endif
-
-static inline physid_mask_t default_apicid_to_cpu_present(int phys_apicid)
-{
-	return physid_mask_of_physid(phys_apicid);
-}
-
-#endif /* CONFIG_X86_LOCAL_APIC */
-#endif /* _ASM_X86_MACH_DEFAULT_MACH_APIC_H */
diff --git a/arch/x86/include/asm/mach-generic/mach_apic.h b/arch/x86/include/asm/mach-generic/mach_apic.h
deleted file mode 100644
index 96f217f..0000000
--- a/arch/x86/include/asm/mach-generic/mach_apic.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _ASM_X86_MACH_GENERIC_MACH_APIC_H
-#define _ASM_X86_MACH_GENERIC_MACH_APIC_H
-
-#include <asm/genapic.h>
-
-extern void generic_bigsmp_probe(void);
-
-#endif /* _ASM_X86_MACH_GENERIC_MACH_APIC_H */
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index d4ac4de..47d0e21 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -173,8 +173,6 @@ extern int safe_smp_processor_id(void);
 
 #endif
 
-#include <asm/genapic.h>
-
 #ifdef CONFIG_X86_LOCAL_APIC
 
 #ifndef CONFIG_X86_64
@@ -184,26 +182,9 @@ static inline int logical_smp_processor_id(void)
 	return GET_APIC_LOGICAL_ID(*(u32 *)(APIC_BASE + APIC_LDR));
 }
 
-static inline unsigned int read_apic_id(void)
-{
-	unsigned int reg;
-
-	reg = *(u32 *)(APIC_BASE + APIC_ID);
-
-	return apic->get_apic_id(reg);
-}
 #endif
 
-
-# if defined(APIC_DEFINITION) || defined(CONFIG_X86_64)
 extern int hard_smp_processor_id(void);
-# else
-static inline int hard_smp_processor_id(void)
-{
-	/* we don't want to mark this access volatile - bad code generation */
-	return read_apic_id();
-}
-# endif /* APIC_DEFINITION */
 
 #else /* CONFIG_X86_LOCAL_APIC */
 
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 7b02a1c..cb8b527 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -42,10 +42,6 @@
 #include <asm/mpspec.h>
 #include <asm/smp.h>
 
-#ifdef CONFIG_X86_LOCAL_APIC
-# include <mach_apic.h>
-#endif
-
 static int __initdata acpi_force = 0;
 u32 acpi_rsdt_forced;
 #ifdef	CONFIG_ACPI
@@ -56,15 +52,7 @@ int acpi_disabled = 1;
 EXPORT_SYMBOL(acpi_disabled);
 
 #ifdef	CONFIG_X86_64
-
-#include <asm/proto.h>
-
-#else				/* X86 */
-
-#ifdef	CONFIG_X86_LOCAL_APIC
-#include <mach_apic.h>
-#endif				/* CONFIG_X86_LOCAL_APIC */
-
+# include <asm/proto.h>
 #endif				/* X86 */
 
 #define BAD_MADT_ENTRY(entry, end) (					    \
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c
index e622080..41a0ba3 100644
--- a/arch/x86/kernel/apic.c
+++ b/arch/x86/kernel/apic.c
@@ -49,7 +49,6 @@
 #include <asm/i8259.h>
 #include <asm/smp.h>
 
-#include <mach_apic.h>
 #include <mach_ipi.h>
 
 /*
@@ -1910,11 +1909,30 @@ void __cpuinit generic_processor_info(int apicid, int version)
 	set_cpu_present(cpu, true);
 }
 
-#ifdef CONFIG_X86_64
 int hard_smp_processor_id(void)
 {
 	return read_apic_id();
 }
+
+void default_init_apic_ldr(void)
+{
+	unsigned long val;
+
+	apic_write(APIC_DFR, APIC_DFR_VALUE);
+	val = apic_read(APIC_LDR) & ~APIC_LDR_MASK;
+	val |= SET_APIC_LOGICAL_ID(1UL << smp_processor_id());
+	apic_write(APIC_LDR, val);
+}
+
+#ifdef CONFIG_X86_32
+int default_apicid_to_node(int logical_apicid)
+{
+#ifdef CONFIG_SMP
+	return apicid_2_node[hard_smp_processor_id()];
+#else
+	return 0;
+#endif
+}
 #endif
 
 /*
diff --git a/arch/x86/kernel/cpu/addon_cpuid_features.c b/arch/x86/kernel/cpu/addon_cpuid_features.c
index e8bb892..4a48bb4 100644
--- a/arch/x86/kernel/cpu/addon_cpuid_features.c
+++ b/arch/x86/kernel/cpu/addon_cpuid_features.c
@@ -7,7 +7,7 @@
 #include <asm/pat.h>
 #include <asm/processor.h>
 
-#include <mach_apic.h>
+#include <asm/genapic.h>
 
 struct cpuid_bit {
 	u16 feature;
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 7c878f6..ff4d7b9 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -12,7 +12,7 @@
 # include <asm/cacheflush.h>
 #endif
 
-#include <mach_apic.h>
+#include <asm/genapic.h>
 
 #include "cpu.h"
 
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 055b9c3..c4bdc7f 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -26,7 +26,7 @@
 #ifdef CONFIG_X86_LOCAL_APIC
 #include <asm/mpspec.h>
 #include <asm/apic.h>
-#include <mach_apic.h>
+#include <asm/genapic.h>
 #include <asm/genapic.h>
 #include <asm/uv/uv.h>
 #endif
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 5deefae..1cef0aa 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -24,7 +24,7 @@
 #ifdef CONFIG_X86_LOCAL_APIC
 #include <asm/mpspec.h>
 #include <asm/apic.h>
-#include <mach_apic.h>
+#include <asm/genapic.h>
 #endif
 
 static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)
diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c
index abae819..e0744ea 100644
--- a/arch/x86/kernel/io_apic.c
+++ b/arch/x86/kernel/io_apic.c
@@ -63,7 +63,7 @@
 #include <asm/uv/uv_irq.h>
 
 #include <mach_ipi.h>
-#include <mach_apic.h>
+#include <asm/genapic.h>
 
 #define __apicdebuginit(type) static type __init
 
diff --git a/arch/x86/kernel/ipi.c b/arch/x86/kernel/ipi.c
index e16c41b..50076d9 100644
--- a/arch/x86/kernel/ipi.c
+++ b/arch/x86/kernel/ipi.c
@@ -19,7 +19,7 @@
 #include <asm/proto.h>
 
 #ifdef CONFIG_X86_32
-#include <mach_apic.h>
+#include <asm/genapic.h>
 #include <mach_ipi.h>
 
 /*
diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
index e0f29be..d802c84 100644
--- a/arch/x86/kernel/irq_32.c
+++ b/arch/x86/kernel/irq_32.c
@@ -231,7 +231,7 @@ unsigned int do_IRQ(struct pt_regs *regs)
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
-#include <mach_apic.h>
+#include <asm/genapic.h>
 
 /* A cpu has been removed from cpu_online_mask.  Reset irq affinities. */
 void fixup_irqs(void)
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index a1452a5..94fe710 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -29,8 +29,7 @@
 #include <asm/setup.h>
 #include <asm/smp.h>
 
-#include <mach_apic.h>
-
+#include <asm/genapic.h>
 /*
  * Checksum an MP configuration block.
  */
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 6b27f6d..92e4293 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -97,7 +97,7 @@
 #include <asm/mmu_context.h>
 #include <asm/proto.h>
 
-#include <mach_apic.h>
+#include <asm/genapic.h>
 #include <asm/paravirt.h>
 #include <asm/hypervisor.h>
 
diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
index c48ba6c..892e7c3 100644
--- a/arch/x86/kernel/smp.c
+++ b/arch/x86/kernel/smp.c
@@ -27,7 +27,7 @@
 #include <asm/mmu_context.h>
 #include <asm/proto.h>
 #include <mach_ipi.h>
-#include <mach_apic.h>
+#include <asm/genapic.h>
 /*
  *	Some notes on x86 processor bugs affecting SMP operation:
  *
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 3fed177..489fde9 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -65,7 +65,7 @@
 #include <asm/uv/uv.h>
 #include <linux/mc146818rtc.h>
 
-#include <mach_apic.h>
+#include <asm/genapic.h>
 #include <smpboot_hooks.h>
 
 #ifdef CONFIG_X86_32
diff --git a/arch/x86/kernel/tlb_uv.c b/arch/x86/kernel/tlb_uv.c
index 89fce1b..755ede0 100644
--- a/arch/x86/kernel/tlb_uv.c
+++ b/arch/x86/kernel/tlb_uv.c
@@ -20,7 +20,7 @@
 #include <asm/tsc.h>
 #include <asm/irq_vectors.h>
 
-#include <mach_apic.h>
+#include <asm/genapic.h>
 
 static struct bau_control	**uv_bau_table_bases __read_mostly;
 static int			uv_bau_retry_limit __read_mostly;
diff --git a/arch/x86/kernel/visws_quirks.c b/arch/x86/kernel/visws_quirks.c
index 2ed5bdf..3bd7f47 100644
--- a/arch/x86/kernel/visws_quirks.c
+++ b/arch/x86/kernel/visws_quirks.c
@@ -34,7 +34,7 @@
 
 #include <mach_ipi.h>
 
-#include "mach_apic.h"
+#include <asm/genapic.h>
 
 #include <linux/kernel_stat.h>
 
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index 07817b2..7d5123e 100644
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -12,7 +12,7 @@
 #include <linux/string.h>
 #include <linux/smp.h>
 #include <linux/init.h>
-#include <asm/mach-default/mach_apic.h>
+#include <asm/genapic.h>
 #include <asm/mach-default/mach_ipi.h>
 
 static void default_vector_allocation_domain(int cpu, struct cpumask *retmask)
diff --git a/arch/x86/mach-generic/probe.c b/arch/x86/mach-generic/probe.c
index ab68c6e..c03c722 100644
--- a/arch/x86/mach-generic/probe.c
+++ b/arch/x86/mach-generic/probe.c
@@ -154,8 +154,3 @@ int __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 	}
 	return 0;
 }
-
-int hard_smp_processor_id(void)
-{
-	return apic->get_apic_id(*(unsigned long *)(APIC_BASE+APIC_ID));
-}
-- 
1.6.0.2


  parent reply	other threads:[~2009-01-29  0:13 UTC|newest]

Thread overview: 129+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-28 23:41 x86: unify genapic code, unify subarchitectures, remove old subarchitecture code Ingo Molnar
2009-01-28 23:41 ` [PATCH 001/114] x86, genapic: refactor genapic_64.h Ingo Molnar
2009-01-28 23:41 ` [PATCH 002/114] x86, genapic: refactor genapic_32.h Ingo Molnar
2009-01-28 23:41 ` [PATCH 003/114] x86, genapic: unify struct genapic Ingo Molnar
2009-01-28 23:41 ` [PATCH 004/114] x86, genapic: finish unification Ingo Molnar
2009-01-28 23:41 ` [PATCH 005/114] x86, genapic: cleanups Ingo Molnar
2009-01-28 23:41 ` [PATCH 006/114] x86, genapic: provide IPI callbacks unconditionally Ingo Molnar
2009-01-28 23:41 ` [PATCH 007/114] x86: rename 'genapic' to 'apic' Ingo Molnar
2009-01-28 23:41 ` [PATCH 008/114] x86: clean up genapic_flat Ingo Molnar
2009-01-28 23:41 ` [PATCH 009/114] x86: clean up genapic_phys_flat Ingo Molnar
2009-01-28 23:41 ` [PATCH 010/114] x86: clean up apic_x2apic_uv_x Ingo Molnar
2009-01-28 23:41 ` [PATCH 011/114] x86: clean up apic_x2apic_phys Ingo Molnar
2009-01-28 23:41 ` [PATCH 012/114] x86: clean up apic_x2apic_cluster Ingo Molnar
2009-01-28 23:41 ` [PATCH 013/114] x86, genapic: cleanup 32-bit apic_default template Ingo Molnar
2009-01-28 23:41 ` [PATCH 014/114] x86, genapic: cleanup 32-bit apic_bigsmp template Ingo Molnar
2009-01-28 23:41 ` [PATCH 015/114] x86, genapic: cleanup 32-bit apic_numaq template Ingo Molnar
2009-01-28 23:41 ` [PATCH 016/114] x86, genapic: cleanup 32-bit apic_es7000 template Ingo Molnar
2009-01-28 23:41 ` [PATCH 017/114] x86, genapic: cleanup 32-bit apic_summit template Ingo Molnar
2009-01-28 23:41 ` [PATCH 018/114] x86: remove APIC_INIT / APICFUNC / IPIFUNC Ingo Molnar
2009-01-28 23:41 ` [PATCH 019/114] x86: clean up apic->acpi_madt_oem_check methods Ingo Molnar
2009-01-28 23:41 ` [PATCH 020/114] x86: clean up apic->apic_id_registered() methods Ingo Molnar
2009-01-28 23:41 ` [PATCH 021/114] x86, genapic: rename int_delivery_mode, et. al Ingo Molnar
2009-01-28 23:41 ` [PATCH 022/114] x86, apic: remove IRQ_DEST_MODE / IRQ_DELIVERY_MODE Ingo Molnar
2009-01-28 23:41 ` [PATCH 023/114] x86, apic: remove DEFAULT_IRQ_DELIVERY_MODE and DEFAULT_IRQ_DEST_MODE Ingo Molnar
2009-01-28 23:41 ` [PATCH 024/114] x86, apic: remove SUMMIT_IRQ_DELIVERY_MODE and SUMMIT_IRQ_DEST_MODE Ingo Molnar
2009-01-28 23:41 ` [PATCH 025/114] x86, apic: remove NUMAQ_IRQ_DELIVERY_MODE and NUMAQ_IRQ_DEST_MODE Ingo Molnar
2009-01-28 23:41 ` [PATCH 026/114] x86, apic: remove BIGSMP_IRQ_DELIVERY_MODE and BIGSMP_IRQ_DEST_MODE Ingo Molnar
2009-01-28 23:41 ` [PATCH 027/114] x86, apic: remove ES7000_IRQ_DELIVERY_MODE and ES7000_IRQ_DEST_MODE Ingo Molnar
2009-01-28 23:41 ` [PATCH 028/114] x86, apic: remove IRQ_DEST_MODE Ingo Molnar
2009-01-28 23:41 ` [PATCH 029/114] x86, apic: clean up target_cpus methods Ingo Molnar
2009-01-28 23:41 ` [PATCH 030/114] x86, apic: clean up / remove TARGET_CPUS Ingo Molnar
2009-01-28 23:41 ` [PATCH 031/114] x86: clean up esr_disable() methods Ingo Molnar
2009-01-28 23:41 ` [PATCH 032/114] x86: rename ->ESR_DISABLE to ->disable_esr Ingo Molnar
2009-01-28 23:41 ` [PATCH 033/114] x86: clean up the APIC_DEST_LOGICAL logic Ingo Molnar
2009-01-28 23:41 ` [PATCH 034/114] x86, apic: rename genapic::apic_destination_logical to genapic::dest_logical Ingo Molnar
2009-01-28 23:41 ` [PATCH 035/114] x86, apic: clean up check_apicid*() callbacks Ingo Molnar
2009-01-28 23:41 ` [PATCH 036/114] x86, apic: remove no_balance_irq and no_ioapic_check flags Ingo Molnar
2009-01-28 23:41 ` [PATCH 037/114] x86, apic: clean up ->vector_allocation_domain() Ingo Molnar
2009-01-28 23:41 ` [PATCH 038/114] x86, apic: clean up ->init_apic_ldr() Ingo Molnar
2009-01-28 23:41 ` [PATCH 039/114] x86, apic: clean up ->ioapic_phys_id_map() Ingo Molnar
2009-01-28 23:41 ` [PATCH 040/114] x86, apic: clean up ->setup_apic_routing() Ingo Molnar
2009-01-28 23:41 ` [PATCH 041/114] x86, apic: streamline the ->multi_timer_check() quirk Ingo Molnar
2009-01-28 23:41 ` [PATCH 042/114] x86, apic: clean up ->apicid_to_node() Ingo Molnar
2009-01-28 23:41 ` [PATCH 043/114] x86, apic: clean up ->cpu_to_logical_apicid() Ingo Molnar
2009-01-28 23:41 ` [PATCH 044/114] x86, apic: clean up ->cpu_present_to_apicid() Ingo Molnar
2009-01-28 23:41 ` [PATCH 045/114] x86, apic: clean up ->apicid_to_cpu_present() Ingo Molnar
2009-01-28 23:41 ` [PATCH 046/114] x86: refactor ->setup_portio_remap() subarch methods Ingo Molnar
2009-01-28 23:41 ` [PATCH 047/114] x86: refactor ->check_phys_apicid_present() " Ingo Molnar
2009-01-28 23:41 ` [PATCH 048/114] x86: refactor ->enable_apic_mode() " Ingo Molnar
2009-01-28 23:41 ` [PATCH 049/114] x86, es7000: clean up es7000_enable_apic_mode() Ingo Molnar
2009-01-28 23:41 ` [PATCH 050/114] x86, apic: unify phys_pkg_id() Ingo Molnar
2009-01-28 23:41 ` [PATCH 051/114] x86, apic: refactor ->phys_pkg_id() Ingo Molnar
2009-01-28 23:41 ` [PATCH 052/114] x86, smp: clean up mps_oem_check() Ingo Molnar
2009-01-28 23:41 ` [PATCH 053/114] x86, mpparse: call the generic quirk handlers early Ingo Molnar
2009-01-28 23:42 ` [PATCH 054/114] x86: consolidate the ->mps_oem_check() code Ingo Molnar
2009-01-28 23:42 ` [PATCH 055/114] x86, apic: refactor ->get_apic_id() & GET_APIC_ID() Ingo Molnar
2009-01-28 23:42 ` [PATCH 056/114] x86, apic: refactor ->apic_id_mask & APIC_ID_MASK Ingo Molnar
2009-01-28 23:42 ` [PATCH 057/114] x86, apic: get rid of *_APIC_ID_MASK definitions Ingo Molnar
2009-01-28 23:42 ` [PATCH 058/114] x86, apic: refactor ->cpu_mask_to_apicid*() Ingo Molnar
2009-01-28 23:42 ` [PATCH 059/114] x86, apic: untangle the send_IPI_*() jungle Ingo Molnar
2009-01-28 23:42 ` [PATCH 060/114] x86, smp: clean up ->trampoline_phys_low/high handling Ingo Molnar
2009-01-28 23:42 ` [PATCH 061/114] x86: set ->trampoline_phys_low/high on 64-bit too Ingo Molnar
2009-01-28 23:42 ` [PATCH 062/114] x86, smp: refactor ->wait_for_init_deassert() Ingo Molnar
2009-01-28 23:42 ` [PATCH 063/114] x86, smp: refactor ->smp_callin_clear_local_apic() methods Ingo Molnar
2009-01-28 23:42 ` [PATCH 064/114] x86, smp: refactor ->store/restore_NMI_vector() methods Ingo Molnar
2009-01-28 23:42 ` [PATCH 065/114] x86, smp: remove ->restore_NMI_vector() Ingo Molnar
2009-01-28 23:42 ` [PATCH 066/114] x86, smp: refactor ->inquire_remote_apic() methods Ingo Molnar
2009-01-28 23:42 ` [PATCH 067/114] x86, ES7000: consolidate the APIC code Ingo Molnar
2009-01-28 23:42 ` [PATCH 068/114] x86, smp: eliminate asm/mach-default/mach_wakecpu.h Ingo Molnar
2009-01-28 23:42 ` [PATCH 069/114] x86: eliminate asm/mach-*/mach_mpparse.h Ingo Molnar
2009-01-28 23:42 ` [PATCH 070/114] x86: remove mach_mpspec.h Ingo Molnar
2009-01-28 23:42 ` [PATCH 071/114] x86: remove mach_apicdef.h Ingo Molnar
2009-01-28 23:42 ` [PATCH 072/114] x86, smp: refactor ->wake_cpu Ingo Molnar
2009-01-28 23:42 ` [PATCH 073/114] x86, numaq: consolidate code Ingo Molnar
2009-01-28 23:42 ` [PATCH 074/114] x86, summit: " Ingo Molnar
2009-01-28 23:42 ` Ingo Molnar [this message]
2009-01-28 23:42 ` [PATCH 076/114] x86, ES7000: Consolidate code Ingo Molnar
2009-01-28 23:42 ` [PATCH 077/114] x86, NUMAQ: " Ingo Molnar
2009-01-28 23:42 ` [PATCH 078/114] x86, bigsmp: consolidate code Ingo Molnar
2009-01-28 23:42 ` [PATCH 079/114] x86, bigsmp: consolidate header code Ingo Molnar
2009-01-28 23:42 ` [PATCH 080/114] x86, smp: remove mach_ipi.h Ingo Molnar
2009-01-28 23:42 ` [PATCH 081/114] x86: remove subarchitecture support code Ingo Molnar
2009-01-28 23:42 ` [PATCH 082/114] x86: move mach-default/*.h files to asm/ Ingo Molnar
2009-01-28 23:42 ` [PATCH 083/114] x86: remove subarchitecture support Ingo Molnar
2009-01-28 23:42 ` [PATCH 084/114] x86/Voyager: clean up BROKEN Kconfig reference Ingo Molnar
2009-01-28 23:42 ` [PATCH 085/114] x86: disable Voyager temporarily Ingo Molnar
2009-01-28 23:42 ` [PATCH 086/114] x86/Voyager: remove MCA Kconfig quirk Ingo Molnar
2009-01-28 23:42 ` [PATCH 087/114] x86/Voyager: remove NATSEMI " Ingo Molnar
2009-01-28 23:42 ` [PATCH 088/114] x86/Voyager: remove KVM " Ingo Molnar
2009-01-28 23:42 ` [PATCH 089/114] x86/Voyager: remove KGDB " Ingo Molnar
2009-01-28 23:42 ` [PATCH 090/114] x86/Voyager: remove HIBERNATION " Ingo Molnar
2009-01-28 23:42 ` [PATCH 091/114] x86/Voyager: remove ARCH_SUSPEND_POSSIBLE " Ingo Molnar
2009-01-28 23:42 ` [PATCH 092/114] x86: replace CONFIG_X86_SMP with CONFIG_SMP Ingo Molnar
2009-01-28 23:42 ` [PATCH 093/114] x86: generalize boot_cpu_id Ingo Molnar
2009-01-28 23:42 ` [PATCH 094/114] x86/Voyager: remove X86_HT Kconfig quirk Ingo Molnar
2009-01-28 23:42 ` [PATCH 095/114] x86/Voyager: remove X86_BIOS_REBOOT " Ingo Molnar
2009-01-28 23:42 ` [PATCH 096/114] x86/Voyager: remove X86_FIND_SMP_CONFIG " Ingo Molnar
2009-01-28 23:42 ` [PATCH 097/114] x86/VisWS: remove " Ingo Molnar
2009-01-28 23:42 ` [PATCH 098/114] x86/Voyager: remove VMI " Ingo Molnar
2009-01-28 23:42 ` [PATCH 099/114] x86/Voyager: remove KVM_CLOCK quirk Ingo Molnar
2009-01-28 23:42 ` [PATCH 100/114] x86/Voyager: remove KVM_GUEST quirk Ingo Molnar
2009-01-28 23:42 ` [PATCH 101/114] x86/Voyager: remove PARAVIRT Kconfig quirk Ingo Molnar
2009-01-28 23:42 ` [PATCH 102/114] x86/Voyager: remove APIC/IO-APIC Kbuild quirk Ingo Molnar
2009-01-28 23:42 ` [PATCH 103/114] x86/Voyager: remove MCE quirk Ingo Molnar
2009-01-28 23:42 ` [PATCH 104/114] x86/Voyager: remove HOTPLUG_CPU Kconfig quirk Ingo Molnar
2009-01-28 23:42 ` [PATCH 105/114] x86/Voyager: remove power management " Ingo Molnar
2009-01-28 23:42 ` [PATCH 106/114] x86/Voyager: remove ISA quirk Ingo Molnar
2009-01-28 23:42 ` [PATCH 107/114] x86: cleanup, introduce CONFIG_NON_STANDARD_PLATFORMS Ingo Molnar
2009-01-28 23:42 ` [PATCH 108/114] x86: move ELAN to the NON_STANDARD_PLATFORM section Ingo Molnar
2009-01-28 23:42 ` [PATCH 109/114] x86: move VOYAGER " Ingo Molnar
2009-01-28 23:42 ` [PATCH 110/114] x86: move non-standard 32-bit platform Kconfig entries Ingo Molnar
2009-01-28 23:42 ` [PATCH 111/114] x86: move X86_VSMP from subarch menu Ingo Molnar
2009-01-28 23:42 ` [PATCH 112/114] x86: remove the " Ingo Molnar
2009-01-28 23:42 ` [PATCH 113/114] x86: rename X86_GENERICARCH to X86_32_NON_STANDARD Ingo Molnar
2009-01-28 23:43 ` [PATCH 114/114] x86/Voyager: move to the X86_32_NON_STANDARD code section Ingo Molnar
2009-01-29  1:52 ` x86: unify genapic code, unify subarchitectures, remove old subarchitecture code Suresh Siddha
2009-01-29 11:27   ` Ingo Molnar
2009-01-29 20:11     ` Suresh Siddha
2009-01-29 20:26       ` Ingo Molnar
2009-01-29 14:02 ` Andi Kleen
2009-01-29 20:36   ` Yinghai Lu
2009-01-29 21:04     ` H. Peter Anvin
2009-01-29 21:24   ` Tim Pepper
2009-01-29 22:14     ` Ingo Molnar
2009-01-29 22:19       ` Valdis.Kletnieks
2009-01-29 22:58       ` Tim Pepper
2009-01-29 23:27         ` Ingo Molnar
2009-01-30  9:01       ` Andi Kleen
2009-01-29 22:29   ` Ingo Molnar

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=1233186180-29883-76-git-send-email-mingo@elte.hu \
    --to=mingo@elte.hu \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.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

all inboxes | Powered by JetHome®