Skip to contentSkip to conversation

move apic declarations to mach_apic.h

PATCH New Glauber Costa 1 participant 1 message Mar 25, 2008 x86

lore
Share & tools
lore
#0 lore raw

PATCH 2/2 move apic declarations to mach_apic.h

take them out of the x86_64-specific asm/mach_apic.h

---
 arch/x86/kernel/apic_64.c                |    2 +-
 arch/x86/kernel/cpu/amd.c                |    2 +-
 arch/x86/kernel/io_apic_64.c             |    2 +-
 arch/x86/kernel/setup_64.c               |    2 +-
 include/asm-x86/mach-default/mach_apic.h |   80 ++++++++++++++++--------------
 include/asm-x86/mach_apic.h              |   26 ----------
 6 files changed, 47 insertions(+), 67 deletions(-)
 delete mode 100644 include/asm-x86/mach_apic.h
arch/x86/kernel/apic_64.c +1 -1
Index: linux-2.6-x86/arch/x86/kernel/apic_64.c
===================================================================
@@ -34,7 +34,6 @@
 #include <asm/mpspec.h>
 #include <asm/hpet.h>
 #include <asm/pgalloc.h>
-#include <asm/mach_apic.h>
 #include <asm/nmi.h>
 #include <asm/idle.h>
 #include <asm/proto.h>
@@ -42,6 +41,7 @@
 #include <asm/apic.h>
 
 #include <mach_ipi.h>
+#include <mach_apic.h>
 
 int disable_apic_timer __cpuinitdata;
 static int apic_calibrate_pmtmr __initdata;
arch/x86/kernel/cpu/amd.c +1 -1
Index: linux-2.6-x86/arch/x86/kernel/cpu/amd.c
===================================================================
@@ -4,8 +4,8 @@
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/apic.h>
-#include <asm/mach_apic.h>
 
+#include <mach_apic.h>
 #include "cpu.h"
 
 /*
arch/x86/kernel/io_apic_64.c +1 -1
Index: linux-2.6-x86/arch/x86/kernel/io_apic_64.c
===================================================================
@@ -43,7 +43,6 @@
 #include <asm/smp.h>
 #include <asm/desc.h>
 #include <asm/proto.h>
-#include <asm/mach_apic.h>
 #include <asm/acpi.h>
 #include <asm/dma.h>
 #include <asm/nmi.h>
@@ -51,6 +50,7 @@
 #include <asm/hypertransport.h>
 
 #include <mach_ipi.h>
+#include <mach_apic.h>
 
 struct irq_cfg {
 	cpumask_t domain;
arch/x86/kernel/setup_64.c +1 -1
Index: linux-2.6-x86/arch/x86/kernel/setup_64.c
===================================================================
@@ -60,7 +60,6 @@
 #include <asm/mmu_context.h>
 #include <asm/proto.h>
 #include <asm/setup.h>
-#include <asm/mach_apic.h>
 #include <asm/numa.h>
 #include <asm/sections.h>
 #include <asm/dmi.h>
@@ -69,6 +68,7 @@
 #include <asm/ds.h>
 #include <asm/topology.h>
 
+#include <mach_apic.h>
 #ifdef CONFIG_PARAVIRT
 #include <asm/paravirt.h>
 #else
include/asm-x86/mach-default/mach_apic.h +46 -37

131 lines not on this page · raw message

include/asm-x86/mach_apic.h deleted +0 -26
Index: linux-2.6-x86/include/asm-x86/mach_apic.h
===================================================================
@@ -1,26 +0,0 @@
-#ifndef __ASM_MACH_APIC_H
-#define __ASM_MACH_APIC_H
-
-/*
- * Copyright 2004 James Cleverdon, IBM.
- * Subject to the GNU Public License, v.2
- *
- * Generic APIC sub-arch defines.
- *
- * Hacked for x86-64 by James Cleverdon from i386 architecture code by
- * Martin Bligh, Andi Kleen, James Bottomley, John Stultz, and
- * James Cleverdon.
- */
-
-#include <asm/genapic.h>
-
-#define INT_DELIVERY_MODE (genapic->int_delivery_mode)
-#define INT_DEST_MODE (genapic->int_dest_mode)
-#define TARGET_CPUS	  (genapic->target_cpus())
-#define vector_allocation_domain	(genapic->vector_allocation_domain)
-#define apic_id_registered (genapic->apic_id_registered)
-#define init_apic_ldr (genapic->init_apic_ldr)
-#define cpu_mask_to_apicid (genapic->cpu_mask_to_apicid)
-#define phys_pkg_id	(genapic->phys_pkg_id)
-
-#endif /* __ASM_MACH_APIC_H */