Home » Mailing list archives » linux-kernel » 2008 » August » 24

[PATCH 14/18] x86: merge header files in apic_xx.c

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Yinghai Lu <yhlu.kernel@...>
To: Ingo Molnar <mingo@...>, Thomas Gleixner <tglx@...>, H. Peter Anvin <hpa@...>, Andrew Morton <akpm@...>
Cc: <linux-kernel@...>, Yinghai Lu <yhlu.kernel@...>
Subject: [PATCH 14/18] x86: merge header files in apic_xx.c
Date: Sunday, August 24, 2008 - 5:01 am

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
---
 arch/x86/kernel/apic_32.c |    8 ++++++++
 arch/x86/kernel/apic_64.c |    7 ++++++-
 2 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 87566a3..749adb5 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -23,11 +23,13 @@
 #include <linux/mc146818rtc.h>
 #include <linux/kernel_stat.h>
 #include <linux/sysdev.h>
+#include <linux/ioport.h>
 #include <linux/cpu.h>
 #include <linux/clockchips.h>
 #include <linux/acpi_pmtmr.h>
 #include <linux/module.h>
 #include <linux/dmi.h>
+#include <linux/dmar.h>
 
 #include <asm/atomic.h>
 #include <asm/smp.h>
@@ -36,8 +38,14 @@
 #include <asm/desc.h>
 #include <asm/arch_hooks.h>
 #include <asm/hpet.h>
+#include <asm/pgalloc.h>
 #include <asm/i8253.h>
 #include <asm/nmi.h>
+#include <asm/idle.h>
+#include <asm/proto.h>
+#include <asm/timex.h>
+#include <asm/apic.h>
+#include <asm/i8259.h>
 
 #include <mach_apic.h>
 #include <mach_apicdef.h>
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index b7268f5..ebe417b 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -24,9 +24,11 @@
 #include <linux/kernel_stat.h>
 #include <linux/sysdev.h>
 #include <linux/ioport.h>
+#include <linux/cpu.h>
 #include <linux/clockchips.h>
 #include <linux/acpi_pmtmr.h>
 #include <linux/module.h>
+#include <linux/dmi.h>
 #include <linux/dmar.h>
 
 #include <asm/atomic.h>
@@ -34,8 +36,10 @@
 #include <asm/mtrr.h>
 #include <asm/mpspec.h>
 #include <asm/desc.h>
+#include <asm/arch_hooks.h>
 #include <asm/hpet.h>
 #include <asm/pgalloc.h>
+#include <asm/i8253.h>
 #include <asm/nmi.h>
 #include <asm/idle.h>
 #include <asm/proto.h>
@@ -43,8 +47,9 @@
 #include <asm/apic.h>
 #include <asm/i8259.h>
 
-#include <mach_ipi.h>
 #include <mach_apic.h>
+#include <mach_apicdef.h>
+#include <mach_ipi.h>
 
 /*
  * Sanity check
-- 
1.5.4.5

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
An idea .... with code, jassi brar, (Sun Aug 24, 4:53 am)
[PATCH 00/18] merge apic_32.c and apic_64.c, Yinghai Lu, (Sun Aug 24, 5:01 am)
Re: An idea .... with code, Andi Kleen, (Tue Aug 26, 4:24 am)
Re: An idea .... with code, jassi brar, (Wed Aug 27, 3:24 am)
Re: An idea .... with code, Andi Kleen, (Wed Aug 27, 3:47 am)
Re: An idea .... with code, jassi brar, (Wed Aug 27, 8:38 am)
Re: An idea .... with code, Andi Kleen, (Wed Aug 27, 8:47 am)
Re: An idea .... with code, Kasper Sandberg, (Wed Aug 27, 10:49 am)
Re: An idea .... with code, Bill Davidsen, (Fri Aug 29, 10:57 pm)
Re: An idea .... with code, Andi Kleen, (Wed Aug 27, 11:02 am)
Re: An idea .... with code, Kasper Sandberg, (Thu Aug 28, 5:41 am)
Re: An idea .... with code, jassi brar, (Wed Aug 27, 9:24 pm)
Re: An idea .... with code, David Newall, (Wed Aug 27, 5:57 am)
Re: An idea .... with code, Andi Kleen, (Wed Aug 27, 6:01 am)
Re: An idea .... with code, Alexey Dobriyan, (Tue Aug 26, 6:44 am)
Re: An idea .... with code, Andi Kleen, (Tue Aug 26, 7:08 am)
Re: An idea .... with code, Bill Davidsen, (Mon Aug 25, 10:47 pm)
Re: An idea .... with code, Jochen Voß, (Mon Aug 25, 8:22 am)
Re: An idea .... with code, Marcin Slusarz, (Mon Aug 25, 4:53 pm)
Re: [PATCH 00/18] merge apic_32.c and apic_64.c, Ingo Molnar, (Sun Aug 24, 8:16 am)
Re: [PATCH 00/18] merge apic_32.c and apic_64.c, Ingo Molnar, (Sun Aug 24, 5:14 am)
[PATCH 18/18] x86: rename apic_32.c and apic_64.c to apic.c, Yinghai Lu, (Sun Aug 24, 5:01 am)
[PATCH 17/18] x86: apic copy apic_64.c to apic_32.c, Yinghai Lu, (Sun Aug 24, 5:01 am)
[PATCH 16/18] x86: apic copy calibrate_APIC_clock to each ot..., Yinghai Lu, (Sun Aug 24, 5:01 am)
[PATCH 15/18] x86: apic unify smp_spurious/error_interrupt, Yinghai Lu, (Sun Aug 24, 5:01 am)
[PATCH 14/18] x86: merge header files in apic_xx.c, Yinghai Lu, (Sun Aug 24, 5:01 am)
[PATCH 13/18] x86: copy detect_init_APIC to the other, Yinghai Lu, (Sun Aug 24, 5:01 am)
[PATCH 12/18] x86: merge APIC_init_uniprocessor, Yinghai Lu, (Sun Aug 24, 5:01 am)
[PATCH 11/18] x86: make apic_32/64.c more like, Yinghai Lu, (Sun Aug 24, 5:01 am)
[PATCH 10/18] x86: add hard_smp_prossor_id with MACRO in io_..., Yinghai Lu, (Sun Aug 24, 5:01 am)
[PATCH 09/18] x86: use HAVE_X2APIC in apic_64.c, Yinghai Lu, (Sun Aug 24, 5:01 am)
[PATCH 08/18] x86: apic_xx.c order variables, Yinghai Lu, (Sun Aug 24, 5:01 am)
[PATCH 07/18] x86: apic - unify smp_apic_timer_interrupt, Yinghai Lu, (Sun Aug 24, 5:01 am)
[PATCH 06/18] x86: apic_32.c should use __cpuinit section, Yinghai Lu, (Sun Aug 24, 5:01 am)
[PATCH 05/18] x86: apic - unify setup_local_APIC, Yinghai Lu, (Sun Aug 24, 5:01 am)
[PATCH 04/18] x86: apic_64.c - add sanity check for spurious..., Yinghai Lu, (Sun Aug 24, 5:01 am)
[PATCH 03/18] x86: apic - unify setup_apicpmtimer, Yinghai Lu, (Sun Aug 24, 5:01 am)
[PATCH 02/18] x86: apic - introduce get_physical_broadcast f..., Yinghai Lu, (Sun Aug 24, 5:01 am)
[PATCH 01/18] x86: apic_64.c - setup_APIC_timer has to be __..., Yinghai Lu, (Sun Aug 24, 5:01 am)