* Re: [PATCH] Clean up asm/pgalloc.h include (s390)
@ 2004-04-19 15:56 Martin Schwidefsky
2004-04-19 16:11 ` Russell King
0 siblings, 1 reply; 4+ messages in thread
From: Martin Schwidefsky @ 2004-04-19 15:56 UTC (permalink / raw)
To: Russell King; +Cc: linux-390, Linux Kernel List, Russell King
> This patch cleans up needless includes of asm/pgalloc.h from the
> arch/s390/ subtree. This has not been compile tested, so
> needs the architecture maintainers (or willing volunteers) to
> test.
Doesn't compile. s390_ksyms needs pgalloc.h for the definition of diag10.
The other includes of pgalloc.h can be removed without a problem.
blue skies,
Martin
Linux/390 Design & Development, IBM Deutschland Entwicklung GmbH
Schönaicherstr. 220, D-71032 Böblingen, Telefon: 49 - (0)7031 - 16-2247
E-Mail: schwidefsky@de.ibm.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Clean up asm/pgalloc.h include (s390)
2004-04-19 15:56 [PATCH] Clean up asm/pgalloc.h include (s390) Martin Schwidefsky
@ 2004-04-19 16:11 ` Russell King
2004-04-20 16:53 ` Arnd Bergmann
0 siblings, 1 reply; 4+ messages in thread
From: Russell King @ 2004-04-19 16:11 UTC (permalink / raw)
To: Martin Schwidefsky; +Cc: linux-390, Linux Kernel List
On Mon, Apr 19, 2004 at 05:56:19PM +0200, Martin Schwidefsky wrote:
> > This patch cleans up needless includes of asm/pgalloc.h from the
> > arch/s390/ subtree. This has not been compile tested, so
> > needs the architecture maintainers (or willing volunteers) to
> > test.
>
> Doesn't compile. s390_ksyms needs pgalloc.h for the definition of diag10.
> The other includes of pgalloc.h can be removed without a problem.
Alternatively, could the diag10() prototype be moved somewhere else
(tlbflush or cacheflush?) Is diag10 a tlb or cache function? It
isn't clear from the code what diag10() does.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] Clean up asm/pgalloc.h include (s390)
2004-04-19 16:11 ` Russell King
@ 2004-04-20 16:53 ` Arnd Bergmann
0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2004-04-20 16:53 UTC (permalink / raw)
To: Russell King, Martin Schwidefsky, linux-390, Linux Kernel List
On Monday 19 April 2004 18:11, Russell King wrote:
> Alternatively, could the diag10() prototype be moved somewhere else
> (tlbflush or cacheflush?) Is diag10 a tlb or cache function? It
> isn't clear from the code what diag10() does.
Think of it as some sort of madvise(,,MADV_DONTNEED) or free() in
hardware. I guess the next best place to put it is <asm/system.h>.
Arnd <><
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] Clean up asm/pgalloc.h include
@ 2004-04-18 22:17 Russell King
2004-04-18 22:23 ` [PATCH 2/2] " Russell King
0 siblings, 1 reply; 4+ messages in thread
From: Russell King @ 2004-04-18 22:17 UTC (permalink / raw)
To: Linux Kernel List, Andrew Morton
This patch cleans up needless includes of asm/pgalloc.h from the
fs/ kernel/ and mm/ subtrees. Compile tested on multiple ARM
platforms, and x86, this patch appears safe.
This patch is part of a larger patch aiming towards getting the
include of asm/pgtable.h out of linux/mm.h, so that asm/pgtable.h
can sanely get at things like mm_struct and friends.
I suggest testing in -mm for a while to ensure there aren't any
hidden arch issues.
fs/binfmt_aout.c | 1 -
fs/binfmt_elf.c | 1 -
fs/binfmt_flat.c | 1 -
fs/exec.c | 1 -
fs/proc/proc_misc.c | 1 -
include/asm-arm26/tlb.h | 1 +
include/asm-generic/tlb.h | 1 +
kernel/module.c | 1 -
mm/highmem.c | 1 -
mm/mincore.c | 1 -
mm/mmap.c | 1 -
mm/mprotect.c | 1 -
mm/mremap.c | 1 -
mm/msync.c | 1 -
mm/nommu.c | 1 -
mm/rmap.c | 1 -
mm/vmalloc.c | 1 -
mm/vmscan.c | 1 -
18 files changed, 2 insertions(+), 16 deletions(-)
diff -urpN orig/fs/binfmt_aout.c linux/fs/binfmt_aout.c
--- orig/fs/binfmt_aout.c Tue Apr 13 19:40:58 2004
+++ linux/fs/binfmt_aout.c Sun Apr 18 17:40:04 2004
@@ -27,7 +27,6 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-#include <asm/pgalloc.h>
#include <asm/cacheflush.h>
static int load_aout_binary(struct linux_binprm *, struct pt_regs * regs);
diff -urpN orig/fs/binfmt_elf.c linux/fs/binfmt_elf.c
--- orig/fs/binfmt_elf.c Tue Apr 13 19:40:58 2004
+++ linux/fs/binfmt_elf.c Sun Apr 18 17:41:05 2004
@@ -40,7 +40,6 @@
#include <asm/uaccess.h>
#include <asm/param.h>
-#include <asm/pgalloc.h>
#include <linux/elf.h>
diff -urpN orig/fs/binfmt_flat.c linux/fs/binfmt_flat.c
--- orig/fs/binfmt_flat.c Sat Feb 28 10:10:05 2004
+++ linux/fs/binfmt_flat.c Sun Apr 18 19:45:54 2004
@@ -40,7 +40,6 @@
#include <asm/byteorder.h>
#include <asm/system.h>
#include <asm/uaccess.h>
-#include <asm/pgalloc.h>
#include <asm/unaligned.h>
#include <asm/cacheflush.h>
diff -urpN orig/fs/exec.c linux/fs/exec.c
--- orig/fs/exec.c Tue Apr 13 19:40:59 2004
+++ linux/fs/exec.c Sun Apr 18 17:39:15 2004
@@ -48,7 +48,6 @@
#include <linux/rmap.h>
#include <asm/uaccess.h>
-#include <asm/pgalloc.h>
#include <asm/mmu_context.h>
#ifdef CONFIG_KMOD
diff -urpN orig/fs/proc/proc_misc.c linux/fs/proc/proc_misc.c
--- orig/fs/proc/proc_misc.c Thu Apr 1 19:33:30 2004
+++ linux/fs/proc/proc_misc.c Sun Apr 18 22:44:44 2004
@@ -47,7 +47,6 @@
#include <asm/uaccess.h>
#include <asm/pgtable.h>
#include <asm/io.h>
-#include <asm/pgalloc.h>
#include <asm/tlb.h>
#include <asm/div64.h>
diff -urpN orig/kernel/module.c linux/kernel/module.c
--- orig/kernel/module.c Tue Apr 13 19:41:19 2004
+++ linux/kernel/module.c Sun Apr 18 17:26:31 2004
@@ -36,7 +36,6 @@
#include <linux/stop_machine.h>
#include <asm/uaccess.h>
#include <asm/semaphore.h>
-#include <asm/pgalloc.h>
#include <asm/cacheflush.h>
#if 0
diff -urpN orig/include/asm-arm26/tlb.h linux/include/asm-arm26/tlb.h
--- orig/include/asm-arm26/tlb.h Sat Jun 14 22:34:36 2003
+++ linux/include/asm-arm26/tlb.h Sun Apr 18 22:58:37 2004
@@ -1,6 +1,7 @@
#ifndef __ASMARM_TLB_H
#define __ASMARM_TLB_H
+#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
/*
diff -urpN orig/include/asm-generic/tlb.h linux/include/asm-generic/tlb.h
--- orig/include/asm-generic/tlb.h Sat Feb 28 10:10:14 2004
+++ linux/include/asm-generic/tlb.h Sun Apr 18 22:58:51 2004
@@ -15,6 +15,7 @@
#include <linux/config.h>
#include <linux/swap.h>
+#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
/*
diff -urpN orig/mm/highmem.c linux/mm/highmem.c
--- orig/mm/highmem.c Thu Mar 11 09:57:01 2004
+++ linux/mm/highmem.c Sun Apr 18 17:30:16 2004
@@ -26,7 +26,6 @@
#include <linux/init.h>
#include <linux/hash.h>
#include <linux/highmem.h>
-#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
static mempool_t *page_pool, *isa_page_pool;
diff -urpN orig/mm/mincore.c linux/mm/mincore.c
--- orig/mm/mincore.c Thu Feb 5 15:27:04 2004
+++ linux/mm/mincore.c Sun Apr 18 22:44:25 2004
@@ -14,7 +14,6 @@
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-#include <asm/pgalloc.h>
/*
* Later we can get more picky about what "in core" means precisely.
diff -urpN orig/mm/mmap.c linux/mm/mmap.c
--- orig/mm/mmap.c Tue Apr 13 19:41:20 2004
+++ linux/mm/mmap.c Sun Apr 18 22:44:19 2004
@@ -23,7 +23,6 @@
#include <linux/mount.h>
#include <asm/uaccess.h>
-#include <asm/pgalloc.h>
#include <asm/tlb.h>
/*
diff -urpN orig/mm/mprotect.c linux/mm/mprotect.c
--- orig/mm/mprotect.c Sat Apr 10 12:31:53 2004
+++ linux/mm/mprotect.c Sun Apr 18 17:35:19 2004
@@ -18,7 +18,6 @@
#include <linux/security.h>
#include <asm/uaccess.h>
-#include <asm/pgalloc.h>
#include <asm/pgtable.h>
#include <asm/cacheflush.h>
#include <asm/tlbflush.h>
diff -urpN orig/mm/mremap.c linux/mm/mremap.c
--- orig/mm/mremap.c Tue Apr 13 19:41:20 2004
+++ linux/mm/mremap.c Sun Apr 18 17:36:04 2004
@@ -19,7 +19,6 @@
#include <linux/security.h>
#include <asm/uaccess.h>
-#include <asm/pgalloc.h>
#include <asm/cacheflush.h>
#include <asm/tlbflush.h>
diff -urpN orig/mm/msync.c linux/mm/msync.c
--- orig/mm/msync.c Thu Feb 5 15:27:04 2004
+++ linux/mm/msync.c Sun Apr 18 22:43:53 2004
@@ -13,7 +13,6 @@
#include <linux/mman.h>
#include <asm/pgtable.h>
-#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
/*
diff -urpN orig/mm/nommu.c linux/mm/nommu.c
--- orig/mm/nommu.c Tue Apr 13 19:41:20 2004
+++ linux/mm/nommu.c Sun Apr 18 23:04:41 2004
@@ -20,7 +20,6 @@
#include <linux/blkdev.h>
#include <linux/backing-dev.h>
-#include <asm/pgalloc.h>
#include <asm/uaccess.h>
#include <asm/tlb.h>
#include <asm/tlbflush.h>
diff -urpN orig/mm/rmap.c linux/mm/rmap.c
--- orig/mm/rmap.c Tue Apr 13 19:41:20 2004
+++ linux/mm/rmap.c Sun Apr 18 22:43:45 2004
@@ -30,7 +30,6 @@
#include <linux/cache.h>
#include <linux/percpu.h>
-#include <asm/pgalloc.h>
#include <asm/rmap.h>
#include <asm/tlb.h>
#include <asm/tlbflush.h>
diff -urpN orig/mm/vmalloc.c linux/mm/vmalloc.c
--- orig/mm/vmalloc.c Wed Feb 18 22:35:30 2004
+++ linux/mm/vmalloc.c Sun Apr 18 22:46:15 2004
@@ -17,7 +17,6 @@
#include <linux/vmalloc.h>
#include <asm/uaccess.h>
-#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
diff -urpN orig/mm/vmscan.c linux/mm/vmscan.c
--- orig/mm/vmscan.c Tue Apr 13 19:41:20 2004
+++ linux/mm/vmscan.c Sun Apr 18 17:28:19 2004
@@ -33,7 +33,6 @@
#include <linux/cpu.h>
#include <linux/notifier.h>
-#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
#include <asm/div64.h>
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 2/2] Clean up asm/pgalloc.h include
2004-04-18 22:17 [PATCH 1/2] Clean up asm/pgalloc.h include Russell King
@ 2004-04-18 22:23 ` Russell King
2004-04-19 13:22 ` [PATCH] Clean up asm/pgalloc.h include (s390) Russell King
0 siblings, 1 reply; 4+ messages in thread
From: Russell King @ 2004-04-18 22:23 UTC (permalink / raw)
To: Linux Kernel List, Andrew Morton
This patch cleans up needless includes of asm/pgalloc.h from the
drivers/ subtree. drivers/char/mem.c has been compile tested;
the others have not, since they are for non-x86 and non-ARM
architectures.
This patch is part of a larger patch aiming towards getting the
include of asm/pgtable.h out of linux/mm.h, so that asm/pgtable.h
can sanely get at things like mm_struct and friends.
I suggest testing in -mm for a while to ensure there aren't any
hidden arch issues.
drivers/char/mem.c | 1 -
drivers/net/82596.c | 1 -
drivers/net/lasi_82596.c | 1 -
drivers/net/macsonic.c | 1 -
drivers/net/sun3lance.c | 1 -
drivers/parisc/ccio-dma.c | 1 -
drivers/parisc/ccio-rm-dma.c | 1 -
drivers/video/console/sticore.c | 1 -
sound/oss/dmasound/dmasound_atari.c | 1 -
9 files changed, 9 deletions(-)
--- orig/drivers/char/mem.c Thu Apr 1 19:33:15 2004
+++ linux/drivers/char/mem.c Sun Apr 18 17:44:40 2004
@@ -26,7 +26,6 @@
#include <asm/uaccess.h>
#include <asm/io.h>
-#include <asm/pgalloc.h>
#ifdef CONFIG_IA64
# include <linux/efi.h>
--- orig/drivers/net/82596.c Sat Mar 20 09:22:30 2004
+++ linux/drivers/net/82596.c Sun Apr 18 23:11:16 2004
@@ -58,7 +58,6 @@
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/pgtable.h>
-#include <asm/pgalloc.h>
static char version[] __initdata =
"82596.c $Revision: 1.5 $\n";
--- orig/drivers/net/lasi_82596.c Sat Mar 20 09:22:33 2004
+++ linux/drivers/net/lasi_82596.c Sun Apr 18 23:11:27 2004
@@ -87,7 +87,6 @@
#include <asm/bitops.h>
#include <asm/io.h>
#include <asm/pgtable.h>
-#include <asm/pgalloc.h>
#include <asm/irq.h>
#include <asm/pdc.h>
#include <asm/cache.h>
--- orig/drivers/net/macsonic.c Wed Feb 18 22:34:13 2004
+++ linux/drivers/net/macsonic.c Sun Apr 18 23:11:39 2004
@@ -53,7 +53,6 @@
#include <asm/macintosh.h>
#include <asm/macints.h>
#include <asm/mac_via.h>
-#include <asm/pgalloc.h>
#define SREGS_PAD(n) u16 n;
--- orig/drivers/net/sun3lance.c Fri Mar 19 11:56:02 2004
+++ linux/drivers/net/sun3lance.c Sun Apr 18 23:11:50 2004
@@ -42,7 +42,6 @@ static char *version = "sun3lance.c: v1.
#include <asm/bitops.h>
#include <asm/io.h>
#include <asm/pgtable.h>
-#include <asm/pgalloc.h>
#include <asm/dvma.h>
#include <asm/idprom.h>
#include <asm/machines.h>
--- orig/drivers/parisc/ccio-dma.c Fri Mar 19 11:56:11 2004
+++ linux/drivers/parisc/ccio-dma.c Sun Apr 18 23:12:29 2004
@@ -44,7 +44,6 @@
#include <asm/byteorder.h>
#include <asm/cache.h> /* for L1_CACHE_BYTES */
#include <asm/uaccess.h>
-#include <asm/pgalloc.h>
#include <asm/page.h>
#include <asm/dma.h>
#include <asm/io.h>
--- orig/drivers/parisc/ccio-rm-dma.c Fri Mar 19 11:56:11 2004
+++ linux/drivers/parisc/ccio-rm-dma.c Sun Apr 18 23:12:39 2004
@@ -40,7 +40,6 @@
#include <linux/pci.h>
#include <asm/uaccess.h>
-#include <asm/pgalloc.h>
#include <asm/io.h>
#include <asm/hardware.h>
--- orig/drivers/video/console/sticore.c Wed Feb 18 22:34:50 2004
+++ linux/drivers/video/console/sticore.c Sun Apr 18 23:12:50 2004
@@ -22,7 +22,6 @@
#include <linux/pci.h>
#include <linux/font.h>
-#include <asm/pgalloc.h>
#include <asm/hardware.h>
#include <asm/parisc-device.h>
#include <asm/cacheflush.h>
--- orig/sound/oss/dmasound/dmasound_atari.c Mon Sep 8 23:38:50 2003
+++ linux/sound/oss/dmasound/dmasound_atari.c Sun Apr 18 23:14:09 2004
@@ -22,7 +22,6 @@
#include <linux/spinlock.h>
#include <linux/interrupt.h>
-#include <asm/pgalloc.h>
#include <asm/uaccess.h>
#include <asm/atariints.h>
#include <asm/atari_stram.h>
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] Clean up asm/pgalloc.h include (s390)
2004-04-18 22:23 ` [PATCH 2/2] " Russell King
@ 2004-04-19 13:22 ` Russell King
0 siblings, 0 replies; 4+ messages in thread
From: Russell King @ 2004-04-19 13:22 UTC (permalink / raw)
To: Linux Kernel List, schwidefsky, linux-390
This patch cleans up needless includes of asm/pgalloc.h from the
arch/s390/ subtree. This has not been compile tested, so
needs the architecture maintainers (or willing volunteers) to
test.
Please ensure that at least the first two patches have already
been applied to your tree; they can be found at:
http://lkml.org/lkml/2004/4/18/86
http://lkml.org/lkml/2004/4/18/87
This patch is part of a larger patch aiming towards getting the
include of asm/pgtable.h out of linux/mm.h, so that asm/pgtable.h
can sanely get at things like mm_struct and friends.
In the event that any of these files fails to build, chances are
you need to include some other header file rather than pgalloc.h.
Normally this is either asm/pgtable.h (unlikely), asm/cacheflush.h
or asm/tlbflush.h.
===== arch/s390/kernel/compat_exec.c 1.4 vs edited =====
--- 1.4/arch/s390/kernel/compat_exec.c Mon Apr 12 18:54:53 2004
+++ edited/arch/s390/kernel/compat_exec.c Mon Apr 19 13:41:44 2004
@@ -26,7 +26,6 @@
#include <linux/security.h>
#include <asm/uaccess.h>
-#include <asm/pgalloc.h>
#include <asm/mmu_context.h>
#ifdef CONFIG_KMOD
===== arch/s390/kernel/ptrace.c 1.22 vs edited =====
--- 1.22/arch/s390/kernel/ptrace.c Thu Apr 15 02:37:53 2004
+++ edited/arch/s390/kernel/ptrace.c Mon Apr 19 13:41:44 2004
@@ -35,7 +35,6 @@
#include <asm/segment.h>
#include <asm/page.h>
#include <asm/pgtable.h>
-#include <asm/pgalloc.h>
#include <asm/system.h>
#include <asm/uaccess.h>
===== arch/s390/kernel/s390_ksyms.c 1.22 vs edited =====
--- 1.22/arch/s390/kernel/s390_ksyms.c Sat Mar 27 11:40:46 2004
+++ edited/arch/s390/kernel/s390_ksyms.c Mon Apr 19 13:41:44 2004
@@ -14,7 +14,6 @@
#include <asm/checksum.h>
#include <asm/cpcmd.h>
#include <asm/delay.h>
-#include <asm/pgalloc.h>
#include <asm/setup.h>
#ifdef CONFIG_IP_MULTICAST
#include <net/arp.h>
===== arch/s390/kernel/smp.c 1.33 vs edited =====
--- 1.33/arch/s390/kernel/smp.c Tue Mar 2 03:01:23 2004
+++ edited/arch/s390/kernel/smp.c Mon Apr 19 13:41:44 2004
@@ -33,7 +33,6 @@
#include <linux/interrupt.h>
#include <asm/sigp.h>
-#include <asm/pgalloc.h>
#include <asm/irq.h>
#include <asm/s390_ext.h>
#include <asm/cpcmd.h>
===== arch/s390/mm/cmm.c 1.2 vs edited =====
--- 1.2/arch/s390/mm/cmm.c Tue Mar 2 03:01:23 2004
+++ edited/arch/s390/mm/cmm.c Mon Apr 19 13:41:44 2004
@@ -17,7 +17,6 @@
#include <linux/sysctl.h>
#include <linux/ctype.h>
-#include <asm/pgalloc.h>
#include <asm/uaccess.h>
#include "../../../drivers/s390/net/smsgiucv.h"
===== arch/s390/mm/ioremap.c 1.8 vs edited =====
--- 1.8/arch/s390/mm/ioremap.c Thu Oct 2 08:11:59 2003
+++ edited/arch/s390/mm/ioremap.c Mon Apr 19 13:41:44 2004
@@ -16,7 +16,6 @@
#include <linux/vmalloc.h>
#include <linux/mm.h>
#include <asm/io.h>
-#include <asm/pgalloc.h>
#include <asm/cacheflush.h>
#include <asm/tlbflush.h>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2004-04-20 16:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-04-19 15:56 [PATCH] Clean up asm/pgalloc.h include (s390) Martin Schwidefsky
2004-04-19 16:11 ` Russell King
2004-04-20 16:53 ` Arnd Bergmann
-- strict thread matches above, loose matches on Subject: below --
2004-04-18 22:17 [PATCH 1/2] Clean up asm/pgalloc.h include Russell King
2004-04-18 22:23 ` [PATCH 2/2] " Russell King
2004-04-19 13:22 ` [PATCH] Clean up asm/pgalloc.h include (s390) Russell King
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox