From: "Jan Beulich" <jbeulich@novell.com>
To: "Andi Kleen" <ak@suse.de>
Cc: <linux-kernel@vger.kernel.org>
Subject: [PATCH] x86: adjust inclusion of asm/fixmap.h
Date: Wed, 14 Feb 2007 07:58:04 +0000 [thread overview]
Message-ID: <45D2CF1C.76E4.0078.0@novell.com> (raw)
Move inclusion of asm/fixmap.h to where it is really used rather than
where it may have been used long ago (requires a few other adjustments
to includes due to previous implicit dependencies).
Signed-off-by: Jan Beulich <jbeulich@novell.com>
--- linux-2.6.20/arch/x86_64/kernel/genapic.c 2007-02-04 19:44:54.000000000 +0100
+++ 2.6.20-x86-fixmap/arch/x86_64/kernel/genapic.c 2007-02-09 10:17:39.000000000 +0100
@@ -18,6 +18,7 @@
#include <asm/smp.h>
#include <asm/ipi.h>
+#include <asm/genapic.h>
#if defined(CONFIG_ACPI)
#include <acpi/acpi_bus.h>
--- linux-2.6.20/arch/x86_64/kernel/genapic_cluster.c 2007-02-04 19:44:54.000000000 +0100
+++ 2.6.20-x86-fixmap/arch/x86_64/kernel/genapic_cluster.c 2007-02-09 10:17:39.000000000 +0100
@@ -17,7 +17,7 @@
#include <linux/init.h>
#include <asm/smp.h>
#include <asm/ipi.h>
-
+#include <asm/genapic.h>
/*
* Set up the logical destination ID.
--- linux-2.6.20/arch/x86_64/kernel/genapic_flat.c 2007-02-04 19:44:54.000000000 +0100
+++ 2.6.20-x86-fixmap/arch/x86_64/kernel/genapic_flat.c 2007-02-09 10:17:39.000000000 +0100
@@ -16,6 +16,7 @@
#include <linux/init.h>
#include <asm/smp.h>
#include <asm/ipi.h>
+#include <asm/genapic.h>
static cpumask_t flat_target_cpus(void)
{
--- linux-2.6.20/include/asm-i386/hpet.h 2007-02-04 19:44:54.000000000 +0100
+++ 2.6.20-x86-fixmap/include/asm-i386/hpet.h 2007-02-09 10:17:39.000000000 +0100
@@ -28,8 +28,6 @@
#include <linux/timex.h>
-#include <asm/fixmap.h>
-
/*
* Documentation on HPET can be found at:
* http://www.intel.com/ial/home/sp/pcmmspec.htm
--- linux-2.6.20/include/asm-i386/kexec.h 2007-02-04 19:44:54.000000000 +0100
+++ 2.6.20-x86-fixmap/include/asm-i386/kexec.h 2007-02-09 10:17:39.000000000 +0100
@@ -21,7 +21,6 @@
#ifndef __ASSEMBLY__
-#include <asm/fixmap.h>
#include <asm/ptrace.h>
#include <asm/string.h>
@@ -29,10 +28,6 @@
* KEXEC_SOURCE_MEMORY_LIMIT maximum page get_free_page can return.
* I.e. Maximum page that is mapped directly into kernel memory,
* and kmap is not required.
- *
- * Someone correct me if FIXADDR_START - PAGEOFFSET is not the correct
- * calculation for the amount of memory directly mappable into the
- * kernel memory space.
*/
/* Maximum physical address we can use pages from */
--- linux-2.6.20/include/asm-i386/pgalloc.h 2007-02-04 19:44:54.000000000 +0100
+++ 2.6.20-x86-fixmap/include/asm-i386/pgalloc.h 2007-02-09 10:17:39.000000000 +0100
@@ -1,7 +1,6 @@
#ifndef _I386_PGALLOC_H
#define _I386_PGALLOC_H
-#include <asm/fixmap.h>
#include <linux/threads.h>
#include <linux/mm.h> /* for struct page */
--- linux-2.6.20/include/asm-i386/smp.h 2007-02-04 19:44:54.000000000 +0100
+++ 2.6.20-x86-fixmap/include/asm-i386/smp.h 2007-02-09 10:17:39.000000000 +0100
@@ -11,16 +11,13 @@
#include <asm/pda.h>
#endif
-#ifdef CONFIG_X86_LOCAL_APIC
-#ifndef __ASSEMBLY__
-#include <asm/fixmap.h>
+#if defined(CONFIG_X86_LOCAL_APIC) && !defined(__ASSEMBLY__)
#include <asm/bitops.h>
#include <asm/mpspec.h>
+#include <asm/apic.h>
#ifdef CONFIG_X86_IO_APIC
#include <asm/io_apic.h>
#endif
-#include <asm/apic.h>
-#endif
#endif
#define BAD_APICID 0xFFu
--- linux-2.6.20/include/asm-x86_64/ipi.h 2007-02-04 19:44:54.000000000 +0100
+++ 2.6.20-x86-fixmap/include/asm-x86_64/ipi.h 2007-02-09 10:17:39.000000000 +0100
@@ -18,10 +18,8 @@
* Subject to the GNU Public License, v.2
*/
-#include <asm/fixmap.h>
#include <asm/hw_irq.h>
-#include <asm/apicdef.h>
-#include <asm/genapic.h>
+#include <asm/apic.h>
/*
* the following functions deal with sending IPIs between CPUs.
--- linux-2.6.20/include/asm-x86_64/pgalloc.h 2007-02-04 19:44:54.000000000 +0100
+++ 2.6.20-x86-fixmap/include/asm-x86_64/pgalloc.h 2007-02-09 10:17:39.000000000 +0100
@@ -1,7 +1,6 @@
#ifndef _X86_64_PGALLOC_H
#define _X86_64_PGALLOC_H
-#include <asm/fixmap.h>
#include <asm/pda.h>
#include <linux/threads.h>
#include <linux/mm.h>
--- linux-2.6.20/include/asm-x86_64/pgtable.h 2007-02-04 19:44:54.000000000 +0100
+++ 2.6.20-x86-fixmap/include/asm-x86_64/pgtable.h 2007-02-09 10:17:39.000000000 +0100
@@ -6,7 +6,6 @@
* the x86-64 page table tree.
*/
#include <asm/processor.h>
-#include <asm/fixmap.h>
#include <asm/bitops.h>
#include <linux/threads.h>
#include <asm/pda.h>
--- linux-2.6.20/include/asm-x86_64/smp.h 2007-02-04 19:44:54.000000000 +0100
+++ 2.6.20-x86-fixmap/include/asm-x86_64/smp.h 2007-02-09 10:17:39.000000000 +0100
@@ -9,10 +9,9 @@
#include <linux/bitops.h>
extern int disable_apic;
-#include <asm/fixmap.h>
#include <asm/mpspec.h>
-#include <asm/io_apic.h>
#include <asm/apic.h>
+#include <asm/io_apic.h>
#include <asm/thread_info.h>
#ifdef CONFIG_SMP
reply other threads:[~2007-02-14 7:58 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=45D2CF1C.76E4.0078.0@novell.com \
--to=jbeulich@novell.com \
--cc=ak@suse.de \
--cc=linux-kernel@vger.kernel.org \
/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®