x86: move mach-default/*.h files to asm/

We are getting rid of subarchitecture support - move the hook files to asm/. (These are now stale and should be replaced with more explicit runtime mechanisms - but the transition is simpler this way.) Signed-off-by: Ingo Molnar <mingo@elte.hu>
git-mirror · Jan 29, 2009 · 1164dd0 · 1164dd0
1 parent 7b38725
commit 1164dd0
Show file tree

Hide file tree

Showing 19 changed files with 16 additions and 11 deletions.
diff --git a/arch/x86/include/asm/mach-default/apm.h → arch/x86/include/asm/apm.h b/arch/x86/include/asm/mach-default/apm.h → arch/x86/include/asm/apm.h
diff --git a/arch/x86/include/asm/mach-default/do_timer.h → arch/x86/include/asm/do_timer.h b/arch/x86/include/asm/mach-default/do_timer.h → arch/x86/include/asm/do_timer.h
diff --git a/...x86/include/asm/mach-default/entry_arch.h → arch/x86/include/asm/entry_arch.h b/...x86/include/asm/mach-default/entry_arch.h → arch/x86/include/asm/entry_arch.h
@@ -41,10 +41,15 @@ BUILD_INTERRUPT3(invalidate_interrupt7,INVALIDATE_TLB_VECTOR_START+7,
  * a much simpler SMP time architecture:
  */
 #ifdef CONFIG_X86_LOCAL_APIC
+
 BUILD_INTERRUPT(apic_timer_interrupt,LOCAL_TIMER_VECTOR)
 BUILD_INTERRUPT(error_interrupt,ERROR_APIC_VECTOR)
 BUILD_INTERRUPT(spurious_interrupt,SPURIOUS_APIC_VECTOR)
 
+#ifdef CONFIG_PERF_COUNTERS
+BUILD_INTERRUPT(perf_counter_interrupt, LOCAL_PERF_VECTOR)
+#endif
+
 #ifdef CONFIG_X86_MCE_P4THERMAL
 BUILD_INTERRUPT(thermal_interrupt,THERMAL_APIC_VECTOR)
 #endif

diff --git a/...x86/include/asm/mach-default/mach_timer.h → arch/x86/include/asm/mach_timer.h b/...x86/include/asm/mach-default/mach_timer.h → arch/x86/include/asm/mach_timer.h
diff --git a/...x86/include/asm/mach-default/mach_traps.h → arch/x86/include/asm/mach_traps.h b/...x86/include/asm/mach-default/mach_traps.h → arch/x86/include/asm/mach_traps.h
diff --git a/.../include/asm/mach-default/pci-functions.h → arch/x86/include/asm/pci-functions.h b/.../include/asm/mach-default/pci-functions.h → arch/x86/include/asm/pci-functions.h
diff --git a/...x86/include/asm/mach-default/setup_arch.h → arch/x86/include/asm/setup_arch.h b/...x86/include/asm/mach-default/setup_arch.h → arch/x86/include/asm/setup_arch.h
diff --git a/.../include/asm/mach-default/smpboot_hooks.h → arch/x86/include/asm/smpboot_hooks.h b/.../include/asm/mach-default/smpboot_hooks.h → arch/x86/include/asm/smpboot_hooks.h
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
@@ -301,7 +301,7 @@ extern int (*console_blank_hook)(int);
  */
 #define APM_ZERO_SEGS
 
-#include "apm.h"
+#include <asm/apm.h>
 
 /*
  * Define to re-initialize the interrupt 0 timer to 100 Hz after a suspend.

diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
@@ -688,7 +688,7 @@ ENDPROC(name)
 #define BUILD_INTERRUPT(name, nr)	BUILD_INTERRUPT3(name, nr, smp_##name)
 
 /* The include is where all of the SMP etc. interrupts come from */
-#include "entry_arch.h"
+#include <asm/entry_arch.h>
 
 ENTRY(coprocessor_error)
 	RING0_INT_FRAME

diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
@@ -34,7 +34,7 @@
 
 #include <asm/mce.h>
 
-#include <mach_traps.h>
+#include <asm/mach_traps.h>
 
 int unknown_nmi_panic;
 int nmi_watchdog_enabled;

diff --git a/arch/x86/kernel/probe_roms_32.c b/arch/x86/kernel/probe_roms_32.c
@@ -18,7 +18,7 @@
 #include <asm/setup.h>
 #include <asm/sections.h>
 #include <asm/io.h>
-#include <setup_arch.h>
+#include <asm/setup_arch.h>
 
 static struct resource system_rom_resource = {
 	.name	= "System ROM",

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
@@ -81,7 +81,7 @@
 #include <asm/io_apic.h>
 #include <asm/ist.h>
 #include <asm/vmi.h>
-#include <setup_arch.h>
+#include <asm/setup_arch.h>
 #include <asm/bios_ebda.h>
 #include <asm/cacheflush.h>
 #include <asm/processor.h>

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
@@ -66,7 +66,7 @@
 #include <linux/mc146818rtc.h>
 
 #include <asm/genapic.h>
-#include <smpboot_hooks.h>
+#include <asm/smpboot_hooks.h>
 
 #ifdef CONFIG_X86_32
 u8 apicid_2_node[MAX_APICID];

diff --git a/arch/x86/kernel/time_32.c b/arch/x86/kernel/time_32.c
@@ -38,7 +38,7 @@
 #include <asm/time.h>
 #include <asm/timer.h>
 
-#include "do_timer.h"
+#include <asm/do_timer.h>
 
 int timer_ack;
 

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
@@ -54,7 +54,7 @@
 #include <asm/desc.h>
 #include <asm/i387.h>
 
-#include <mach_traps.h>
+#include <asm/mach_traps.h>
 
 #ifdef CONFIG_X86_64
 #include <asm/pgalloc.h>

diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
@@ -7,7 +7,7 @@
 #include <linux/module.h>
 #include <linux/uaccess.h>
 #include <asm/pci_x86.h>
-#include <asm/mach-default/pci-functions.h>
+#include <asm/pci-functions.h>
 
 /* BIOS32 signature: "_32_" */
 #define BIOS32_SIGNATURE	(('_' << 0) + ('3' << 8) + ('2' << 16) + ('_' << 24))

diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c
@@ -143,7 +143,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_LE,
 #endif
 
 #ifndef CONFIG_X86_64
-#include "mach_timer.h"
+#include <asm/mach_timer.h>
 #define PMTMR_EXPECTED_RATE \
   ((CALIBRATE_LATCH * (PMTMR_TICKS_PER_SEC >> 10)) / (CLOCK_TICK_RATE>>10))
 /*

diff --git a/drivers/clocksource/cyclone.c b/drivers/clocksource/cyclone.c
@@ -7,7 +7,7 @@
 #include <asm/pgtable.h>
 #include <asm/io.h>
 
-#include "mach_timer.h"
+#include <asm/mach_timer.h>
 
 #define CYCLONE_CBAR_ADDR	0xFEB00CD0	/* base address ptr */
 #define CYCLONE_PMCC_OFFSET	0x51A0		/* offset to control register */