diff options
author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2006-03-20 17:01:16 +0100 |
---|---|---|
committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2006-03-20 17:01:16 +0100 |
commit | bb9e70bf52d7650a35cf17f595fbde8337dbb3cd (patch) | |
tree | e3e84df6316f020645f8b96789bbd8407bb38d99 /xen/include/asm-x86/mach-generic | |
parent | 57ac22d8993a68cf30d7f7cc3004bf709ed8d871 (diff) | |
download | xen-bb9e70bf52d7650a35cf17f595fbde8337dbb3cd.tar.gz xen-bb9e70bf52d7650a35cf17f595fbde8337dbb3cd.tar.bz2 xen-bb9e70bf52d7650a35cf17f595fbde8337dbb3cd.zip |
Upgrade genapic code to 2.6.16-rc6 codebase. Remove entries from
genapic structure that Xen does not require (mostly because we do
not support Visual Workstation nor IBM/Sequent NUMA-Q).
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'xen/include/asm-x86/mach-generic')
-rw-r--r-- | xen/include/asm-x86/mach-generic/mach_apic.h | 23 | ||||
-rw-r--r-- | xen/include/asm-x86/mach-generic/mach_apicdef.h | 1 | ||||
-rw-r--r-- | xen/include/asm-x86/mach-generic/mach_mpparse.h | 12 |
3 files changed, 29 insertions, 7 deletions
diff --git a/xen/include/asm-x86/mach-generic/mach_apic.h b/xen/include/asm-x86/mach-generic/mach_apic.h index d9dc039da9..1e0f6b9435 100644 --- a/xen/include/asm-x86/mach-generic/mach_apic.h +++ b/xen/include/asm-x86/mach-generic/mach_apic.h @@ -14,13 +14,10 @@ #define init_apic_ldr (genapic->init_apic_ldr) #define ioapic_phys_id_map (genapic->ioapic_phys_id_map) #define clustered_apic_check (genapic->clustered_apic_check) -#define multi_timer_check (genapic->multi_timer_check) #define apicid_to_node (genapic->apicid_to_node) #define cpu_to_logical_apicid (genapic->cpu_to_logical_apicid) #define cpu_present_to_apicid (genapic->cpu_present_to_apicid) #define apicid_to_cpu_present (genapic->apicid_to_cpu_present) -#define mpc_apic_id (genapic->mpc_apic_id) -#define setup_portio_remap (genapic->setup_portio_remap) #define check_apicid_present (genapic->check_apicid_present) #define check_phys_apicid_present (genapic->check_phys_apicid_present) #define check_apicid_used (genapic->check_apicid_used) @@ -28,6 +25,26 @@ #define enable_apic_mode (genapic->enable_apic_mode) #define phys_pkg_id (genapic->phys_pkg_id) +static inline int mpc_apic_id(struct mpc_config_processor *m, + struct mpc_config_translation *translation_record) +{ + printk("Processor #%d %d:%d APIC version %d\n", + m->mpc_apicid, + (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8, + (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4, + m->mpc_apicver); + return (m->mpc_apicid); +} + +static inline void setup_portio_remap(void) +{ +} + +static inline int multi_timer_check(int apic, int irq) +{ + return 0; +} + extern void generic_bigsmp_probe(void); #endif /* __ASM_MACH_APIC_H */ diff --git a/xen/include/asm-x86/mach-generic/mach_apicdef.h b/xen/include/asm-x86/mach-generic/mach_apicdef.h index 28ed98972c..78eada8442 100644 --- a/xen/include/asm-x86/mach-generic/mach_apicdef.h +++ b/xen/include/asm-x86/mach-generic/mach_apicdef.h @@ -5,7 +5,6 @@ #include <asm/genapic.h> #define GET_APIC_ID (genapic->get_apic_id) -#define APIC_ID_MASK (genapic->apic_id_mask) #endif #endif diff --git a/xen/include/asm-x86/mach-generic/mach_mpparse.h b/xen/include/asm-x86/mach-generic/mach_mpparse.h index dbd9fce54f..b2308e9149 100644 --- a/xen/include/asm-x86/mach-generic/mach_mpparse.h +++ b/xen/include/asm-x86/mach-generic/mach_mpparse.h @@ -1,10 +1,16 @@ #ifndef _MACH_MPPARSE_H #define _MACH_MPPARSE_H 1 -#include <asm/genapic.h> +static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name, + struct mpc_config_translation *translation) +{ + Dprintk("Bus #%d is %s\n", m->mpc_busid, name); +} -#define mpc_oem_bus_info (genapic->mpc_oem_bus_info) -#define mpc_oem_pci_bus (genapic->mpc_oem_pci_bus) +static inline void mpc_oem_pci_bus(struct mpc_config_bus *m, + struct mpc_config_translation *translation) +{ +} int mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid); int acpi_madt_oem_check(char *oem_id, char *oem_table_id); |