From: Tom Rini <trini@kernel.crashing.org>
To: Linus Torvalds <torvalds@transmeta.com>
Cc: Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [PATCH] Cleanup i386 <linux/init.h> abuses
Date: Wed, 5 Jun 2002 09:36:14 -0700 [thread overview]
Message-ID: <20020605163614.GF1335@opus.bloom.county> (raw)
In-Reply-To: <Pine.LNX.4.33.0206021853030.1383-100000@penguin.transmeta.com>
The following patch cleans up the i386 usage of <linux/init.h>.
This remove <linux/init.h> from <asm-i386/system.h> which did not need
it, <asm-i386/highmem.h> which only had it due to an extern using
__init, which is not needed.
This adds <linux/init.h> to <asm-i386/bugs.h> which actually has
numerous __init functions and adds <linux/init.h> to 9 files inside of
arch/i386 which were indirectly including <linux/init.h> previously.
--
Tom Rini (TR1265)
http://gate.crashing.org/~trini/
===== arch/i386/kernel/setup-visws.c 1.1 vs edited =====
--- 1.1/arch/i386/kernel/setup-visws.c Tue Feb 5 16:59:42 2002
+++ edited/arch/i386/kernel/setup-visws.c Wed Jun 5 09:15:52 2002
@@ -3,6 +3,8 @@
* Split out from setup.c by davej@suse.de
*/
+#include <linux/init.h>
+
char visws_board_type = -1;
char visws_board_rev = -1;
===== arch/i386/mm/ioremap.c 1.8 vs edited =====
--- 1.8/arch/i386/mm/ioremap.c Fri May 3 05:26:39 2002
+++ edited/arch/i386/mm/ioremap.c Wed Jun 5 09:02:02 2002
@@ -9,6 +9,7 @@
*/
#include <linux/vmalloc.h>
+#include <linux/init.h>
#include <asm/io.h>
#include <asm/pgalloc.h>
#include <asm/fixmap.h>
===== arch/i386/pci/acpi.c 1.7 vs edited =====
--- 1.7/arch/i386/pci/acpi.c Wed May 29 15:54:35 2002
+++ edited/arch/i386/pci/acpi.c Wed Jun 5 09:11:10 2002
@@ -1,5 +1,6 @@
#include <linux/pci.h>
#include <linux/acpi.h>
+#include <linux/init.h>
#include "pci.h"
static int __init pci_acpi_init(void)
===== arch/i386/pci/common.c 1.31 vs edited =====
--- 1.31/arch/i386/pci/common.c Wed May 29 15:54:35 2002
+++ edited/arch/i386/pci/common.c Wed Jun 5 09:11:18 2002
@@ -7,6 +7,7 @@
#include <linux/sched.h>
#include <linux/pci.h>
#include <linux/ioport.h>
+#include <linux/init.h>
#include <asm/segment.h>
#include <asm/io.h>
===== arch/i386/pci/direct.c 1.6 vs edited =====
--- 1.6/arch/i386/pci/direct.c Tue May 7 10:27:29 2002
+++ edited/arch/i386/pci/direct.c Wed Jun 5 09:08:16 2002
@@ -3,6 +3,7 @@
*/
#include <linux/pci.h>
+#include <linux/init.h>
#include "pci.h"
/*
===== arch/i386/pci/fixup.c 1.9 vs edited =====
--- 1.9/arch/i386/pci/fixup.c Tue Jun 4 01:21:43 2002
+++ edited/arch/i386/pci/fixup.c Wed Jun 5 09:11:20 2002
@@ -3,6 +3,7 @@
*/
#include <linux/pci.h>
+#include <linux/init.h>
#include "pci.h"
===== arch/i386/pci/legacy.c 1.6 vs edited =====
--- 1.6/arch/i386/pci/legacy.c Wed May 29 15:54:35 2002
+++ edited/arch/i386/pci/legacy.c Wed Jun 5 09:11:22 2002
@@ -1,6 +1,7 @@
/*
* legacy.c - traditional, old school PCI bus probing
*/
+#include <linux/init.h>
#include <linux/pci.h>
#include "pci.h"
===== arch/i386/pci/numa.c 1.7 vs edited =====
--- 1.7/arch/i386/pci/numa.c Wed May 29 15:54:35 2002
+++ edited/arch/i386/pci/numa.c Wed Jun 5 09:11:28 2002
@@ -2,6 +2,7 @@
* numa.c - Low-level PCI access for NUMA-Q machines
*/
#include <linux/pci.h>
+#include <linux/init.h>
#include "pci.h"
===== arch/i386/pci/pcbios.c 1.6 vs edited =====
--- 1.6/arch/i386/pci/pcbios.c Tue May 7 10:27:29 2002
+++ edited/arch/i386/pci/pcbios.c Wed Jun 5 09:07:11 2002
@@ -3,6 +3,7 @@
*/
#include <linux/pci.h>
+#include <linux/init.h>
#include "pci.h"
===== include/asm-i386/bugs.h 1.6 vs edited =====
--- 1.6/include/asm-i386/bugs.h Mon May 20 16:07:18 2002
+++ edited/include/asm-i386/bugs.h Wed Jun 5 08:48:57 2002
@@ -21,6 +21,7 @@
*/
#include <linux/config.h>
+#include <linux/init.h>
#include <asm/processor.h>
#include <asm/i387.h>
#include <asm/msr.h>
===== include/asm-i386/highmem.h 1.6 vs edited =====
--- 1.6/include/asm-i386/highmem.h Thu Apr 4 21:51:47 2002
+++ edited/include/asm-i386/highmem.h Wed Jun 5 08:48:57 2002
@@ -21,7 +21,6 @@
#ifdef __KERNEL__
#include <linux/config.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <asm/kmap_types.h>
#include <asm/tlbflush.h>
@@ -33,7 +32,7 @@
extern pgprot_t kmap_prot;
extern pte_t *pkmap_page_table;
-extern void kmap_init(void) __init;
+extern void kmap_init(void);
/*
* Right now we initialize only a single pte table. It can be extended
===== include/asm-i386/system.h 1.11 vs edited =====
--- 1.11/include/asm-i386/system.h Tue Feb 12 09:53:18 2002
+++ edited/include/asm-i386/system.h Wed Jun 5 08:48:57 2002
@@ -3,7 +3,6 @@
#include <linux/config.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <asm/segment.h>
#include <linux/bitops.h> /* for LOCK_PREFIX */
next prev parent reply other threads:[~2002-06-05 16:36 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-06-03 1:56 Linux 2.5.20 Linus Torvalds
2002-06-03 3:06 ` 2.5.20 -- suspend.c still breaks the build (originally reported for 2.5.18) Miles Lane
2002-06-04 14:06 ` Pavel Machek
2002-06-03 3:18 ` [patch] i386 "General Options" - begone [take 2] Brad Hards
2002-06-03 22:42 ` Rusty Russell
2002-06-04 14:09 ` Pavel Machek
2002-06-04 22:05 ` Brad Hards
2002-06-02 5:16 ` Pavel Machek
2002-06-03 13:34 ` Oops Linux 2.5.20 Martin Dalecki
2002-06-03 14:06 ` [PATCH] 2.5.20 airo wireless - "I can't get no, compilation..." Martin Dalecki
2002-06-03 14:09 ` ]PATCH] 2.5.20 IDE 83 Martin Dalecki
2002-06-04 12:07 ` Jens Axboe
2002-06-04 15:30 ` [PATCH] 2.5.20 IDE 84 Martin Dalecki
2002-06-05 13:03 ` [PATCH] 2.5.20 IDE 85 Martin Dalecki
2002-06-05 14:17 ` Jens Axboe
2002-06-05 14:00 ` Martin Dalecki
2002-06-05 15:48 ` Jens Axboe
2002-06-05 15:52 ` Jens Axboe
2002-06-05 15:10 ` Martin Dalecki
2002-06-05 16:14 ` Jens Axboe
2002-06-05 15:26 ` Martin Dalecki
2002-06-05 18:02 ` Jeff Garzik
2002-06-06 7:17 ` Martin Dalecki
2002-06-05 16:36 ` Tom Rini [this message]
2002-06-07 11:01 ` [PATCH] Cleanup i386 <linux/init.h> abuses Pavel Machek
2002-06-07 19:19 ` Thunder from the hill
2002-06-07 19:26 ` Tom Rini
2002-06-05 23:22 ` [PATCH] Add <linux/kdev_t.h> to <linux/bio.h> Tom Rini
2002-06-05 23:34 ` Russell King
2002-06-05 23:42 ` Tom Rini
2002-06-06 18:33 ` [PATCH] Move vmalloc wrappers out of include/linux/vmalloc.h Tom Rini
2002-06-06 19:44 ` [PATCH] Remove <linux/mm.h> from <linux/vmalloc.h> Tom Rini
2002-06-06 21:02 ` [PATCH] More work on removing " Tom Rini
2002-06-06 21:21 ` [PATCH] Include <linux/gfp.h> directly instead of via <linux/mm.h> Tom Rini
2002-06-06 21:24 ` [PATCH] Remove numerous includes from <linux/mm.h> Tom Rini
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=20020605163614.GF1335@opus.bloom.county \
--to=trini@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.com \
/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