[PATCH 1/2] Clean up asm/pgalloc.h include

[PATCH 1/2] Clean up asm/pgalloc.h include

[Russell King]

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

Re: [PATCH 2/2] Clean up asm/pgalloc.h include

[Russell King]

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

Re: [PATCH 3/2] Clean up asm/pgalloc.h include

[Russell King]

This patch cleans up needless includes of asm/pgalloc.h from the
arch/i386/ subtree.  Compile tested on x86_pc SMP.

[I also tried VISWS + SMP without PM doesn't build in smpboot.c,
 though I don't believe its caused by this patch.  With PM, fails
 to link complaining maxcpus is undefined.  Therefore, I presume
 VISWS + SMP is an invalid configuration.]

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.

The outstanding list of files for other architectures can be found
at http://www.arm.linux.org.uk/misc/pgalloc.txt

 arch/i386/kernel/acpi/boot.c            |    2 +-
 arch/i386/kernel/apic.c                 |    1 -
 arch/i386/kernel/efi.c                  |    1 -
 arch/i386/kernel/i386_ksyms.c           |    1 -
 arch/i386/kernel/irq.c                  |    1 -
 arch/i386/kernel/mpparse.c              |    1 -
 arch/i386/kernel/smp.c                  |    1 -
 arch/i386/kernel/smpboot.c              |    1 -
 arch/i386/kernel/traps.c                |    1 -
 arch/i386/kernel/vm86.c                 |    1 -
 arch/i386/mach-visws/traps.c            |    1 -
 arch/i386/mach-voyager/voyager_basic.c  |    1 -
 arch/i386/mach-voyager/voyager_smp.c    |    1 -
 arch/i386/mach-voyager/voyager_thread.c |    1 -
 arch/i386/mm/fault.c                    |    1 -
 arch/i386/mm/hugetlbpage.c              |    1 -
 arch/i386/mm/init.c                     |    1 -
 arch/i386/mm/ioremap.c                  |    1 -
 18 files changed, 1 insertion(+), 18 deletions(-)

diff -urpN orig/arch/i386/kernel/acpi/boot.c linux/arch/i386/kernel/acpi/boot.c
--- orig/arch/i386/kernel/acpi/boot.c	Sat Apr 10 12:31:37 2004
+++ linux/arch/i386/kernel/acpi/boot.c	Sun Apr 18 23:28:55 2004
@@ -28,7 +28,7 @@
 #include <linux/acpi.h>
 #include <linux/efi.h>
 #include <linux/irq.h>
-#include <asm/pgalloc.h>
+#include <asm/pgtable.h>
 #include <asm/io_apic.h>
 #include <asm/apic.h>
 #include <asm/io.h>
diff -urpN orig/arch/i386/kernel/apic.c linux/arch/i386/kernel/apic.c
--- orig/arch/i386/kernel/apic.c	Thu Mar  4 13:25:17 2004
+++ linux/arch/i386/kernel/apic.c	Sun Apr 18 23:24:53 2004
@@ -31,7 +31,6 @@
 #include <asm/smp.h>
 #include <asm/mtrr.h>
 #include <asm/mpspec.h>
-#include <asm/pgalloc.h>
 #include <asm/desc.h>
 #include <asm/arch_hooks.h>
 #include <asm/hpet.h>
diff -urpN orig/arch/i386/kernel/efi.c linux/arch/i386/kernel/efi.c
--- orig/arch/i386/kernel/efi.c	Thu Feb  5 15:24:49 2004
+++ linux/arch/i386/kernel/efi.c	Sun Apr 18 23:25:02 2004
@@ -37,7 +37,6 @@
 #include <asm/pgtable.h>
 #include <asm/processor.h>
 #include <asm/desc.h>
-#include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
 
 #define EFI_DEBUG	0
diff -urpN orig/arch/i386/kernel/i386_ksyms.c linux/arch/i386/kernel/i386_ksyms.c
--- orig/arch/i386/kernel/i386_ksyms.c	Sat Mar 20 09:22:13 2004
+++ linux/arch/i386/kernel/i386_ksyms.c	Sun Apr 18 23:25:11 2004
@@ -29,7 +29,6 @@
 #include <asm/mmx.h>
 #include <asm/desc.h>
 #include <asm/pgtable.h>
-#include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
 #include <asm/nmi.h>
 #include <asm/ist.h>
diff -urpN orig/arch/i386/kernel/irq.c linux/arch/i386/kernel/irq.c
--- orig/arch/i386/kernel/irq.c	Tue Apr 13 19:40:03 2004
+++ linux/arch/i386/kernel/irq.c	Sun Apr 18 23:25:20 2004
@@ -41,7 +41,6 @@
 #include <asm/system.h>
 #include <asm/bitops.h>
 #include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 #include <asm/delay.h>
 #include <asm/desc.h>
 #include <asm/irq.h>
diff -urpN orig/arch/i386/kernel/mpparse.c linux/arch/i386/kernel/mpparse.c
--- orig/arch/i386/kernel/mpparse.c	Thu Apr  1 19:33:01 2004
+++ linux/arch/i386/kernel/mpparse.c	Sun Apr 18 23:25:28 2004
@@ -28,7 +28,6 @@
 #include <asm/acpi.h>
 #include <asm/mtrr.h>
 #include <asm/mpspec.h>
-#include <asm/pgalloc.h>
 #include <asm/io_apic.h>
 
 #include <mach_apic.h>
diff -urpN orig/arch/i386/kernel/smp.c linux/arch/i386/kernel/smp.c
--- orig/arch/i386/kernel/smp.c	Thu Mar 11 09:56:46 2004
+++ linux/arch/i386/kernel/smp.c	Sun Apr 18 23:25:34 2004
@@ -21,7 +21,6 @@
 #include <linux/interrupt.h>
 
 #include <asm/mtrr.h>
-#include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
 #include <mach_ipi.h>
 #include <mach_apic.h>
diff -urpN orig/arch/i386/kernel/smpboot.c linux/arch/i386/kernel/smpboot.c
--- orig/arch/i386/kernel/smpboot.c	Tue Apr 13 19:40:05 2004
+++ linux/arch/i386/kernel/smpboot.c	Sun Apr 18 23:25:41 2004
@@ -46,7 +46,6 @@
 
 #include <linux/delay.h>
 #include <linux/mc146818rtc.h>
-#include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
 #include <asm/desc.h>
 #include <asm/arch_hooks.h>
diff -urpN orig/arch/i386/kernel/traps.c linux/arch/i386/kernel/traps.c
--- orig/arch/i386/kernel/traps.c	Tue Apr 13 19:40:05 2004
+++ linux/arch/i386/kernel/traps.c	Sun Apr 18 23:25:52 2004
@@ -47,7 +47,6 @@
 #include <asm/nmi.h>
 
 #include <asm/smp.h>
-#include <asm/pgalloc.h>
 #include <asm/arch_hooks.h>
 
 #include <linux/irq.h>
diff -urpN orig/arch/i386/kernel/vm86.c linux/arch/i386/kernel/vm86.c
--- orig/arch/i386/kernel/vm86.c	Thu Mar 11 09:56:46 2004
+++ linux/arch/i386/kernel/vm86.c	Sun Apr 18 23:26:01 2004
@@ -44,7 +44,6 @@
 #include <linux/ptrace.h>
 
 #include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 #include <asm/io.h>
 #include <asm/tlbflush.h>
 #include <asm/irq.h>
diff -urpN orig/arch/i386/mach-visws/traps.c linux/arch/i386/mach-visws/traps.c
--- orig/arch/i386/mach-visws/traps.c	Tue Feb 25 10:57:32 2003
+++ linux/arch/i386/mach-visws/traps.c	Sun Apr 18 23:26:10 2004
@@ -8,7 +8,6 @@
 #include <linux/pci_ids.h>
 
 #include <asm/io.h>
-#include <asm/pgalloc.h>
 #include <asm/arch_hooks.h>
 #include <asm/apic.h>
 #include "cobalt.h"
diff -urpN orig/arch/i386/mach-voyager/voyager_basic.c linux/arch/i386/mach-voyager/voyager_basic.c
--- orig/arch/i386/mach-voyager/voyager_basic.c	Thu Oct  9 00:03:45 2003
+++ linux/arch/i386/mach-voyager/voyager_basic.c	Sun Apr 18 23:26:19 2004
@@ -24,7 +24,6 @@
 #include <linux/reboot.h>
 #include <linux/sysrq.h>
 #include <asm/io.h>
-#include <asm/pgalloc.h>
 #include <asm/voyager.h>
 #include <asm/vic.h>
 #include <linux/pm.h>
diff -urpN orig/arch/i386/mach-voyager/voyager_smp.c linux/arch/i386/mach-voyager/voyager_smp.c
--- orig/arch/i386/mach-voyager/voyager_smp.c	Fri Mar 19 11:55:21 2004
+++ linux/arch/i386/mach-voyager/voyager_smp.c	Sun Apr 18 23:26:27 2004
@@ -24,7 +24,6 @@
 #include <asm/desc.h>
 #include <asm/voyager.h>
 #include <asm/vic.h>
-#include <asm/pgalloc.h>
 #include <asm/mtrr.h>
 #include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
diff -urpN orig/arch/i386/mach-voyager/voyager_thread.c linux/arch/i386/mach-voyager/voyager_thread.c
--- orig/arch/i386/mach-voyager/voyager_thread.c	Fri Feb 21 19:48:37 2003
+++ linux/arch/i386/mach-voyager/voyager_thread.c	Sun Apr 18 23:26:33 2004
@@ -28,7 +28,6 @@
 #include <asm/desc.h>
 #include <asm/voyager.h>
 #include <asm/vic.h>
-#include <asm/pgalloc.h>
 #include <asm/mtrr.h>
 #include <asm/msr.h>
 
diff -urpN orig/arch/i386/mm/fault.c linux/arch/i386/mm/fault.c
--- orig/arch/i386/mm/fault.c	Thu Dec 18 09:57:40 2003
+++ linux/arch/i386/mm/fault.c	Sun Apr 18 23:26:40 2004
@@ -24,7 +24,6 @@
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 #include <asm/hardirq.h>
 #include <asm/desc.h>
 
diff -urpN orig/arch/i386/mm/hugetlbpage.c linux/arch/i386/mm/hugetlbpage.c
--- orig/arch/i386/mm/hugetlbpage.c	Tue Apr 13 19:40:05 2004
+++ linux/arch/i386/mm/hugetlbpage.c	Sun Apr 18 23:26:48 2004
@@ -16,7 +16,6 @@
 #include <linux/err.h>
 #include <linux/sysctl.h>
 #include <asm/mman.h>
-#include <asm/pgalloc.h>
 #include <asm/tlb.h>
 #include <asm/tlbflush.h>
 
diff -urpN orig/arch/i386/mm/init.c linux/arch/i386/mm/init.c
--- orig/arch/i386/mm/init.c	Wed Apr 14 21:17:13 2004
+++ linux/arch/i386/mm/init.c	Sun Apr 18 23:26:56 2004
@@ -32,7 +32,6 @@
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
-#include <asm/pgalloc.h>
 #include <asm/dma.h>
 #include <asm/fixmap.h>
 #include <asm/e820.h>
diff -urpN orig/arch/i386/mm/ioremap.c linux/arch/i386/mm/ioremap.c
--- orig/arch/i386/mm/ioremap.c	Tue Nov 25 15:56:31 2003
+++ linux/arch/i386/mm/ioremap.c	Sun Apr 18 23:27:02 2004
@@ -12,7 +12,6 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <asm/io.h>
-#include <asm/pgalloc.h>
 #include <asm/fixmap.h>
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.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

Re: [PATCH] Clean up asm/pgalloc.h include (alpha)

[Russell King]

This patch cleans up needless includes of asm/pgalloc.h from the
arch/alpha/ 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.

===== kernel/alpha_ksyms.c 1.37 vs edited =====
--- 1.37/arch/alpha/kernel/alpha_ksyms.c	Thu Mar 18 00:58:10 2004
+++ edited/kernel/alpha_ksyms.c	Mon Apr 19 13:31:55 2004
@@ -29,7 +29,6 @@
 #include <asm/fpu.h>
 #include <asm/irq.h>
 #include <asm/machvec.h>
-#include <asm/pgalloc.h>
 #include <asm/semaphore.h>
 #include <asm/tlbflush.h>
 #include <asm/cacheflush.h>
===== kernel/core_irongate.c 1.13 vs edited =====
--- 1.13/arch/alpha/kernel/core_irongate.c	Fri Feb 13 15:19:31 2004
+++ edited/kernel/core_irongate.c	Mon Apr 19 13:32:41 2004
@@ -302,7 +302,6 @@
 #include <linux/vmalloc.h>
 #include <linux/agp_backend.h>
 #include <linux/agpgart.h>
-#include <asm/pgalloc.h>
 
 #define GET_PAGE_DIR_OFF(addr) (addr >> 22)
 #define GET_PAGE_DIR_IDX(addr) (GET_PAGE_DIR_OFF(addr))
===== kernel/core_marvel.c 1.16 vs edited =====
--- 1.16/arch/alpha/kernel/core_marvel.c	Fri Feb 13 15:19:31 2004
+++ edited/kernel/core_marvel.c	Mon Apr 19 13:32:41 2004
@@ -22,7 +22,6 @@
 #include <asm/ptrace.h>
 #include <asm/smp.h>
 #include <asm/gct.h>
-#include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
 #include <asm/rtc.h>
 
===== kernel/core_titan.c 1.22 vs edited =====
--- 1.22/arch/alpha/kernel/core_titan.c	Fri Feb 13 15:19:31 2004
+++ edited/kernel/core_titan.c	Mon Apr 19 13:32:41 2004
@@ -19,7 +19,6 @@
 
 #include <asm/ptrace.h>
 #include <asm/smp.h>
-#include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
 
 #include "proto.h"
===== kernel/machvec_impl.h 1.3 vs edited =====
--- 1.3/arch/alpha/kernel/machvec_impl.h	Thu Jan 16 22:23:45 2003
+++ edited/kernel/machvec_impl.h	Mon Apr 19 13:32:41 2004
@@ -7,7 +7,6 @@
  */
 
 #include <linux/config.h>
-#include <asm/pgalloc.h>
 
 /* Whee.  These systems don't have an HAE:
        IRONGATE, MARVEL, POLARIS, TSUNAMI, TITAN, WILDFIRE
===== kernel/smp.c 1.40 vs edited =====
--- 1.40/arch/alpha/kernel/smp.c	Sun Mar 14 01:57:41 2004
+++ edited/kernel/smp.c	Mon Apr 19 13:32:41 2004
@@ -34,7 +34,6 @@
 #include <asm/irq.h>
 #include <asm/bitops.h>
 #include <asm/pgtable.h>
-#include <asm/pgalloc.h>
 #include <asm/hardirq.h>
 #include <asm/mmu_context.h>
 #include <asm/tlbflush.h>
===== mm/numa.c 1.14 vs edited =====
--- 1.14/arch/alpha/mm/numa.c	Tue Mar 30 21:52:19 2004
+++ edited/mm/numa.c	Mon Apr 19 13:32:41 2004
@@ -15,7 +15,6 @@
 #include <linux/initrd.h>
 
 #include <asm/hwrpb.h>
-#include <asm/pgalloc.h>
 
 pg_data_t node_data[MAX_NUMNODES];
 bootmem_data_t node_bdata[MAX_NUMNODES];
===== mm/remap.c 1.1 vs edited =====
--- 1.1/arch/alpha/mm/remap.c	Thu Sep  5 02:10:58 2002
+++ edited/mm/remap.c	Mon Apr 19 13:32:41 2004
@@ -1,5 +1,4 @@
 #include <linux/vmalloc.h>
-#include <asm/pgalloc.h>
 #include <asm/cacheflush.h>
 
 /* called with the page_table_lock held */

Re: [PATCH] Clean up asm/pgalloc.h include (arm26)

[Russell King]

This patch cleans up needless includes of asm/pgalloc.h from the
arch/arm26/ 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.

===== kernel/armksyms.c 1.2 vs edited =====
--- 1.2/arch/arm26/kernel/armksyms.c	Wed Feb 25 10:31:13 2004
+++ edited/kernel/armksyms.c	Mon Apr 19 13:33:35 2004
@@ -27,7 +27,6 @@
 #include <asm/elf.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/pgalloc.h>
 //#include <asm/proc-fns.h>
 #include <asm/processor.h>
 #include <asm/semaphore.h>
===== kernel/ecard.c 1.3 vs edited =====
--- 1.3/arch/arm26/kernel/ecard.c	Wed Aug 27 01:27:45 2003
+++ edited/kernel/ecard.c	Mon Apr 19 13:33:35 2004
@@ -42,7 +42,6 @@
 #include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/pgalloc.h>
 #include <asm/mmu_context.h>
 #include <asm/irq.h>
 #include <asm/irqchip.h>
===== kernel/fiq.c 1.1 vs edited =====
--- 1.1/arch/arm26/kernel/fiq.c	Wed Jun  4 12:15:45 2003
+++ edited/kernel/fiq.c	Mon Apr 19 13:33:35 2004
@@ -46,7 +46,6 @@
 #include <asm/fiq.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/pgalloc.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
 
===== kernel/signal.c 1.1 vs edited =====
--- 1.1/arch/arm26/kernel/signal.c	Wed Jun  4 12:15:45 2003
+++ edited/kernel/signal.c	Mon Apr 19 13:33:35 2004
@@ -25,7 +25,6 @@
 #include <linux/binfmts.h>
 #include <linux/elf.h>
 
-#include <asm/pgalloc.h>
 #include <asm/ucontext.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
===== kernel/traps.c 1.3 vs edited =====
--- 1.3/arch/arm26/kernel/traps.c	Wed Oct  8 03:53:37 2003
+++ edited/kernel/traps.c	Mon Apr 19 13:33:35 2004
@@ -28,7 +28,6 @@
 
 #include <asm/atomic.h>
 #include <asm/io.h>
-#include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
===== mm/init.c 1.5 vs edited =====
--- 1.5/arch/arm26/mm/init.c	Sun Sep  7 23:46:00 2003
+++ edited/mm/init.c	Mon Apr 19 13:33:35 2004
@@ -26,7 +26,6 @@
 
 #include <asm/segment.h>
 #include <asm/mach-types.h>
-#include <asm/pgalloc.h>
 #include <asm/dma.h>
 #include <asm/hardware.h>
 #include <asm/setup.h>

Re: [PATCH] Clean up asm/pgalloc.h include (cris)

[Russell King]

This patch cleans up needless includes of asm/pgalloc.h from the
arch/cris/ 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/cris/mm/ioremap.c 1.5 vs edited =====
--- 1.5/arch/cris/mm/ioremap.c	Thu Oct  2 08:11:59 2003
+++ edited/arch/cris/mm/ioremap.c	Mon Apr 19 13:33:59 2004
@@ -11,7 +11,6 @@
 
 #include <linux/vmalloc.h>
 #include <asm/io.h>
-#include <asm/pgalloc.h>
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
 

Re: [PATCH] Clean up asm/pgalloc.h include (H8300)

[Russell King]

*** H8300 doesn't seem to have a maintainer ***

This patch cleans up needless includes of asm/pgalloc.h from the
arch/h8300/ 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/h8300/kernel/h8300_ksyms.c 1.2 vs edited =====
--- 1.2/arch/h8300/kernel/h8300_ksyms.c	Wed Sep 24 07:15:36 2003
+++ edited/arch/h8300/kernel/h8300_ksyms.c	Mon Apr 19 13:34:39 2004
@@ -10,7 +10,6 @@
 #include <linux/config.h>
 
 #include <asm/setup.h>
-#include <asm/pgalloc.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/semaphore.h>
===== arch/h8300/mm/kmap.c 1.1 vs edited =====
--- 1.1/arch/h8300/mm/kmap.c	Mon Feb 17 00:01:58 2003
+++ edited/arch/h8300/mm/kmap.c	Mon Apr 19 13:34:39 2004
@@ -19,7 +19,6 @@
 #include <asm/setup.h>
 #include <asm/segment.h>
 #include <asm/page.h>
-#include <asm/pgalloc.h>
 #include <asm/io.h>
 #include <asm/system.h>
 

Re: [PATCH] Clean up asm/pgalloc.h include (ia64)

[Russell King]

This patch cleans up needless includes of asm/pgalloc.h from the
arch/ia64/ 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/ia64/kernel/irq.c 1.37 vs edited =====
--- 1.37/arch/ia64/kernel/irq.c	Sat Feb 28 01:13:48 2004
+++ edited/arch/ia64/kernel/irq.c	Mon Apr 19 13:35:16 2004
@@ -42,7 +42,6 @@
 #include <asm/system.h>
 #include <asm/bitops.h>
 #include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 #include <asm/delay.h>
 #include <asm/irq.h>
 
===== arch/ia64/kernel/smp.c 1.30 vs edited =====
--- 1.30/arch/ia64/kernel/smp.c	Thu Mar 25 19:53:03 2004
+++ edited/arch/ia64/kernel/smp.c	Mon Apr 19 13:35:16 2004
@@ -39,7 +39,6 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/page.h>
-#include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/processor.h>
 #include <asm/ptrace.h>
===== arch/ia64/kernel/smpboot.c 1.49 vs edited =====
--- 1.49/arch/ia64/kernel/smpboot.c	Thu Mar 25 19:53:03 2004
+++ edited/arch/ia64/kernel/smpboot.c	Mon Apr 19 13:35:16 2004
@@ -38,7 +38,6 @@
 #include <asm/machvec.h>
 #include <asm/mca.h>
 #include <asm/page.h>
-#include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/processor.h>
 #include <asm/ptrace.h>
===== arch/ia64/mm/contig.c 1.4 vs edited =====
--- 1.4/arch/ia64/mm/contig.c	Fri Mar 12 05:59:24 2004
+++ edited/arch/ia64/mm/contig.c	Mon Apr 19 13:36:06 2004
@@ -21,7 +21,6 @@
 #include <linux/swap.h>
 
 #include <asm/meminit.h>
-#include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/sections.h>
 
===== arch/ia64/mm/discontig.c 1.13 vs edited =====
--- 1.13/arch/ia64/mm/discontig.c	Fri Mar 12 06:15:26 2004
+++ edited/arch/ia64/mm/discontig.c	Mon Apr 19 13:36:06 2004
@@ -16,7 +16,6 @@
 #include <linux/bootmem.h>
 #include <linux/acpi.h>
 #include <linux/efi.h>
-#include <asm/pgalloc.h>
 #include <asm/tlb.h>
 #include <asm/meminit.h>
 #include <asm/numa.h>
===== arch/ia64/mm/hugetlbpage.c 1.23 vs edited =====
--- 1.23/arch/ia64/mm/hugetlbpage.c	Sat Apr 17 19:19:31 2004
+++ edited/arch/ia64/mm/hugetlbpage.c	Mon Apr 19 13:36:06 2004
@@ -19,7 +19,6 @@
 #include <linux/slab.h>
 #include <linux/sysctl.h>
 #include <asm/mman.h>
-#include <asm/pgalloc.h>
 #include <asm/tlb.h>
 #include <asm/tlbflush.h>
 
===== arch/ia64/mm/tlb.c 1.21 vs edited =====
--- 1.21/arch/ia64/mm/tlb.c	Mon Jan  5 15:40:36 2004
+++ edited/arch/ia64/mm/tlb.c	Mon Apr 19 13:36:06 2004
@@ -19,7 +19,6 @@
 
 #include <asm/delay.h>
 #include <asm/mmu_context.h>
-#include <asm/pgalloc.h>
 #include <asm/pal.h>
 #include <asm/tlbflush.h>
 
===== arch/ia64/sn/kernel/sn2/cache.c 1.6 vs edited =====
--- 1.6/arch/ia64/sn/kernel/sn2/cache.c	Thu Feb 12 15:55:56 2004
+++ edited/arch/ia64/sn/kernel/sn2/cache.c	Mon Apr 19 13:36:06 2004
@@ -7,7 +7,7 @@
  *
  */
 #include <linux/module.h>
-#include <asm/pgalloc.h>
+#include <asm/cacheflush.h>
 
 /**
  * sn_flush_all_caches - flush a range of address from all caches (incl. L4)

Re: [PATCH] Clean up asm/pgalloc.h include (m68k)

[Russell King]

This patch cleans up needless includes of asm/pgalloc.h from the
arch/m68k/ 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/m68k/kernel/m68k_ksyms.c 1.11 vs edited =====
--- 1.11/arch/m68k/kernel/m68k_ksyms.c	Mon Mar 31 23:29:49 2003
+++ edited/arch/m68k/kernel/m68k_ksyms.c	Mon Apr 19 13:37:04 2004
@@ -11,7 +11,6 @@
 
 #include <asm/setup.h>
 #include <asm/machdep.h>
-#include <asm/pgalloc.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/semaphore.h>
===== arch/m68k/kernel/traps.c 1.18 vs edited =====
--- 1.18/arch/m68k/kernel/traps.c	Sun Mar 21 19:44:20 2004
+++ edited/arch/m68k/kernel/traps.c	Mon Apr 19 13:37:04 2004
@@ -37,7 +37,6 @@
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/traps.h>
-#include <asm/pgalloc.h>
 #include <asm/machdep.h>
 #include <asm/siginfo.h>
 
===== arch/m68k/mm/fault.c 1.4 vs edited =====
--- 1.4/arch/m68k/mm/fault.c	Thu Jan  9 14:02:02 2003
+++ edited/arch/m68k/mm/fault.c	Mon Apr 19 13:37:04 2004
@@ -15,7 +15,6 @@
 #include <asm/traps.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 
 extern void die_if_kernel(char *, struct pt_regs *, long);
 extern const int frame_extra_sizes[]; /* in m68k/kernel/signal.c */
===== arch/m68k/mm/init.c 1.12 vs edited =====
--- 1.12/arch/m68k/mm/init.c	Mon Feb 23 05:24:04 2004
+++ edited/arch/m68k/mm/init.c	Mon Apr 19 13:37:04 2004
@@ -21,7 +21,6 @@
 #include <asm/setup.h>
 #include <asm/uaccess.h>
 #include <asm/page.h>
-#include <asm/pgalloc.h>
 #include <asm/system.h>
 #include <asm/machdep.h>
 #include <asm/io.h>
===== arch/m68k/mm/kmap.c 1.4 vs edited =====
--- 1.4/arch/m68k/mm/kmap.c	Sun Mar 21 21:29:28 2004
+++ edited/arch/m68k/mm/kmap.c	Mon Apr 19 13:37:04 2004
@@ -18,7 +18,6 @@
 #include <asm/setup.h>
 #include <asm/segment.h>
 #include <asm/page.h>
-#include <asm/pgalloc.h>
 #include <asm/io.h>
 #include <asm/system.h>
 
===== arch/m68k/mm/memory.c 1.13 vs edited =====
--- 1.13/arch/m68k/mm/memory.c	Mon Apr 12 18:54:39 2004
+++ edited/arch/m68k/mm/memory.c	Mon Apr 19 13:37:04 2004
@@ -16,7 +16,6 @@
 #include <asm/setup.h>
 #include <asm/segment.h>
 #include <asm/page.h>
-#include <asm/pgalloc.h>
 #include <asm/system.h>
 #include <asm/traps.h>
 #include <asm/machdep.h>
===== arch/m68k/mm/motorola.c 1.10 vs edited =====
--- 1.10/arch/m68k/mm/motorola.c	Sun Mar 21 21:22:15 2004
+++ edited/arch/m68k/mm/motorola.c	Mon Apr 19 13:37:04 2004
@@ -23,7 +23,6 @@
 #include <asm/setup.h>
 #include <asm/uaccess.h>
 #include <asm/page.h>
-#include <asm/pgalloc.h>
 #include <asm/system.h>
 #include <asm/machdep.h>
 #include <asm/io.h>
===== arch/m68k/sun3x/dvma.c 1.3 vs edited =====
--- 1.3/arch/m68k/sun3x/dvma.c	Mon May 20 14:43:35 2002
+++ edited/arch/m68k/sun3x/dvma.c	Mon Apr 19 13:37:04 2004
@@ -23,7 +23,6 @@
 #include <asm/io.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
-#include <asm/pgalloc.h>
 
 /* IOMMU support */
 

Re: [PATCH] Clean up asm/pgalloc.h include (m68knommu)

[Russell King]

*** m68knommu does not appear to have a maintainer listed ***

This patch cleans up needless includes of asm/pgalloc.h from the
arch/m68knommu/ 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/m68knommu/kernel/m68k_ksyms.c 1.3 vs edited =====
--- 1.3/arch/m68knommu/kernel/m68k_ksyms.c	Mon Mar 31 23:29:49 2003
+++ edited/arch/m68knommu/kernel/m68k_ksyms.c	Mon Apr 19 13:37:30 2004
@@ -11,7 +11,6 @@
 
 #include <asm/setup.h>
 #include <asm/machdep.h>
-#include <asm/pgalloc.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/semaphore.h>
===== arch/m68knommu/mm/kmap.c 1.1 vs edited =====
--- 1.1/arch/m68knommu/mm/kmap.c	Fri Nov  1 15:19:55 2002
+++ edited/arch/m68knommu/mm/kmap.c	Mon Apr 19 13:37:30 2004
@@ -16,7 +16,6 @@
 #include <asm/setup.h>
 #include <asm/segment.h>
 #include <asm/page.h>
-#include <asm/pgalloc.h>
 #include <asm/io.h>
 #include <asm/system.h>
 

Re: [PATCH] Clean up asm/pgalloc.h include (mips)

[Russell King]

This patch cleans up needless includes of asm/pgalloc.h from the
arch/mips/ 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/mips/baget/baget.c 1.2 vs edited =====
--- 1.2/arch/mips/baget/baget.c	Tue Apr 15 04:10:11 2003
+++ edited/arch/mips/baget/baget.c	Mon Apr 19 13:38:40 2004
@@ -12,7 +12,6 @@
 #include <asm/bootinfo.h>
 #include <asm/mipsregs.h>
 #include <asm/pgtable.h>
-#include <asm/pgalloc.h>
 
 #include <asm/baget/baget.h>
 
===== arch/mips/kernel/irixelf.c 1.9 vs edited =====
--- 1.9/arch/mips/kernel/irixelf.c	Mon Apr 12 18:54:53 2004
+++ edited/arch/mips/kernel/irixelf.c	Mon Apr 19 13:38:40 2004
@@ -31,7 +31,6 @@
 #include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 #include <asm/mipsregs.h>
 #include <asm/prctl.h>
 
===== arch/mips/kernel/signal32.c 1.15 vs edited =====
--- 1.15/arch/mips/kernel/signal32.c	Sat Apr 17 19:19:30 2004
+++ edited/arch/mips/kernel/signal32.c	Mon Apr 19 13:38:40 2004
@@ -21,7 +21,6 @@
 
 #include <asm/asm.h>
 #include <asm/bitops.h>
-#include <asm/pgalloc.h>
 #include <asm/sim.h>
 #include <asm/uaccess.h>
 #include <asm/ucontext.h>
===== arch/mips/kernel/signal_n32.c 1.2 vs edited =====
--- 1.2/arch/mips/kernel/signal_n32.c	Thu Feb 19 20:53:00 2004
+++ edited/arch/mips/kernel/signal_n32.c	Mon Apr 19 13:38:40 2004
@@ -29,7 +29,6 @@
 
 #include <asm/asm.h>
 #include <asm/bitops.h>
-#include <asm/pgalloc.h>
 #include <asm/sim.h>
 #include <asm/uaccess.h>
 #include <asm/ucontext.h>
===== arch/mips/kernel/sysirix.c 1.23 vs edited =====
--- 1.23/arch/mips/kernel/sysirix.c	Wed Mar 31 14:31:23 2004
+++ edited/arch/mips/kernel/sysirix.c	Mon Apr 19 13:38:40 2004
@@ -33,7 +33,6 @@
 
 #include <asm/ptrace.h>
 #include <asm/page.h>
-#include <asm/pgalloc.h>
 #include <asm/uaccess.h>
 #include <asm/inventory.h>
 
===== arch/mips/mm/fault.c 1.9 vs edited =====
--- 1.9/arch/mips/mm/fault.c	Thu Feb 19 20:53:00 2004
+++ edited/arch/mips/mm/fault.c	Mon Apr 19 13:38:40 2004
@@ -22,7 +22,6 @@
 
 #include <asm/branch.h>
 #include <asm/hardirq.h>
-#include <asm/pgalloc.h>
 #include <asm/mmu_context.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
===== arch/mips/mm/init.c 1.1 vs edited =====
--- 1.1/arch/mips/mm/init.c	Sat Feb 21 01:33:01 2004
+++ edited/arch/mips/mm/init.c	Mon Apr 19 13:38:40 2004
@@ -29,7 +29,6 @@
 #include <asm/cachectl.h>
 #include <asm/cpu.h>
 #include <asm/dma.h>
-#include <asm/pgalloc.h>
 #include <asm/mmu_context.h>
 #include <asm/sections.h>
 #include <asm/tlb.h>
===== arch/mips/mm/ioremap.c 1.5 vs edited =====
--- 1.5/arch/mips/mm/ioremap.c	Thu Oct  2 08:11:59 2003
+++ edited/arch/mips/mm/ioremap.c	Mon Apr 19 13:38:40 2004
@@ -13,7 +13,6 @@
 #include <linux/vmalloc.h>
 #include <asm/cacheflush.h>
 #include <asm/io.h>
-#include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
 
 static inline void remap_area_pte(pte_t * pte, unsigned long address,
===== arch/mips/mm/pgtable-64.c 1.2 vs edited =====
--- 1.2/arch/mips/mm/pgtable-64.c	Thu Feb 19 20:53:00 2004
+++ edited/arch/mips/mm/pgtable-64.c	Mon Apr 19 13:38:40 2004
@@ -9,7 +9,6 @@
 #include <linux/init.h>
 #include <linux/mm.h>
 #include <asm/pgtable.h>
-#include <asm/pgalloc.h>
 
 void pgd_init(unsigned long page)
 {
===== arch/mips/sgi-ip27/ip27-init.c 1.10 vs edited =====
--- 1.10/arch/mips/sgi-ip27/ip27-init.c	Thu Feb 19 20:53:02 2004
+++ edited/arch/mips/sgi-ip27/ip27-init.c	Mon Apr 19 13:38:40 2004
@@ -14,7 +14,6 @@
 #include <linux/mm.h>
 #include <linux/cpumask.h>
 #include <asm/cpu.h>
-#include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/sn/types.h>
 #include <asm/sn/sn0/addrs.h>
===== arch/mips/sgi-ip27/ip27-memory.c 1.8 vs edited =====
--- 1.8/arch/mips/sgi-ip27/ip27-memory.c	Thu Feb 19 20:53:02 2004
+++ edited/arch/mips/sgi-ip27/ip27-memory.c	Mon Apr 19 13:38:40 2004
@@ -20,7 +20,6 @@
 #include <asm/bootinfo.h>
 #include <asm/addrspace.h>
 #include <asm/pgtable.h>
-#include <asm/pgalloc.h>
 #include <asm/sn/types.h>
 #include <asm/sn/addrs.h>
 #include <asm/sn/hub.h>

Re: [PATCH] Clean up asm/pgalloc.h include (parisc)

[Russell King]

This patch cleans up needless includes of asm/pgalloc.h from the
arch/parisc/ 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/parisc/hpux/sys_hpux.c 1.10 vs edited =====
--- 1.10/arch/parisc/hpux/sys_hpux.c	Wed Feb 25 10:31:12 2004
+++ edited/arch/parisc/hpux/sys_hpux.c	Mon Apr 19 13:39:57 2004
@@ -32,7 +32,6 @@
 #include <linux/vfs.h>
 
 #include <asm/errno.h>
-#include <asm/pgalloc.h>
 #include <asm/uaccess.h>
 
 unsigned long hpux_brk(unsigned long addr)
===== arch/parisc/kernel/cache.c 1.9 vs edited =====
--- 1.9/arch/parisc/kernel/cache.c	Sun Apr 18 17:13:09 2004
+++ edited/arch/parisc/kernel/cache.c	Mon Apr 19 13:39:57 2004
@@ -24,7 +24,6 @@
 #include <asm/tlbflush.h>
 #include <asm/system.h>
 #include <asm/page.h>
-#include <asm/pgalloc.h>
 #include <asm/processor.h>
 
 int split_tlb;
===== arch/parisc/kernel/init_task.c 1.7 vs edited =====
--- 1.7/arch/parisc/kernel/init_task.c	Wed Feb  4 05:41:56 2004
+++ edited/arch/parisc/kernel/init_task.c	Mon Apr 19 13:39:57 2004
@@ -30,7 +30,6 @@
 
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
-#include <asm/pgalloc.h>
 
 static struct fs_struct init_fs = INIT_FS;
 static struct files_struct init_files = INIT_FILES;
===== arch/parisc/kernel/pci-dma.c 1.9 vs edited =====
--- 1.9/arch/parisc/kernel/pci-dma.c	Sun Mar 14 19:17:06 2004
+++ edited/arch/parisc/kernel/pci-dma.c	Mon Apr 19 13:39:57 2004
@@ -29,7 +29,6 @@
 #include <asm/dma.h>    /* for DMA_CHUNK_SIZE */
 #include <asm/io.h>
 #include <asm/page.h>	/* get_order */
-#include <asm/pgalloc.h>
 #include <asm/uaccess.h>
 
 static struct proc_dir_entry * proc_gsc_root = NULL;
===== arch/parisc/kernel/signal.c 1.13 vs edited =====
--- 1.13/arch/parisc/kernel/signal.c	Thu Dec 18 05:48:39 2003
+++ edited/arch/parisc/kernel/signal.c	Mon Apr 19 13:39:57 2004
@@ -30,7 +30,6 @@
 #include <asm/ucontext.h>
 #include <asm/rt_sigframe.h>
 #include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 #include <asm/cacheflush.h>
 
 #ifdef CONFIG_COMPAT
===== arch/parisc/kernel/smp.c 1.10 vs edited =====
--- 1.10/arch/parisc/kernel/smp.c	Sun Mar 14 01:57:41 2004
+++ edited/arch/parisc/kernel/smp.c	Mon Apr 19 13:39:55 2004
@@ -39,7 +39,7 @@
 #include <asm/bitops.h>
 #include <asm/current.h>
 #include <asm/delay.h>
-#include <asm/pgalloc.h>	/* for flush_tlb_all() proto/macro */
+#include <asm/tlbflush.h>	/* for flush_tlb_all() proto/macro */
 
 #include <asm/io.h>
 #include <asm/irq.h>		/* for CPU_IRQ_REGION and friends */
===== arch/parisc/mm/ioremap.c 1.2 vs edited =====
--- 1.2/arch/parisc/mm/ioremap.c	Thu Oct  2 08:11:59 2003
+++ edited/arch/parisc/mm/ioremap.c	Mon Apr 19 13:39:57 2004
@@ -12,7 +12,6 @@
 #include <linux/vmalloc.h>
 #include <linux/errno.h>
 #include <asm/io.h>
-#include <asm/pgalloc.h>
 
 static inline void remap_area_pte(pte_t * pte, unsigned long address, unsigned long size,
 	unsigned long phys_addr, unsigned long flags)
===== arch/parisc/mm/kmap.c 1.4 vs edited =====
--- 1.4/arch/parisc/mm/kmap.c	Wed Feb  4 05:42:01 2004
+++ edited/arch/parisc/mm/kmap.c	Mon Apr 19 13:39:57 2004
@@ -34,7 +34,6 @@
 #include <linux/vmalloc.h>
 
 #include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 
 #include <asm/io.h>
 #include <asm/page.h>		/* get_order */

Re: [PATCH] Clean up asm/pgalloc.h include (ppc)

[Russell King]

This patch cleans up needless includes of asm/pgalloc.h from the
arch/ppc/ 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/ppc/mm/44x_mmu.c 1.3 vs edited =====
--- 1.3/arch/ppc/mm/44x_mmu.c	Fri Feb 13 15:24:55 2004
+++ edited/arch/ppc/mm/44x_mmu.c	Mon Apr 19 13:40:33 2004
@@ -42,7 +42,6 @@
 #include <linux/bootmem.h>
 #include <linux/highmem.h>
 
-#include <asm/pgalloc.h>
 #include <asm/prom.h>
 #include <asm/io.h>
 #include <asm/mmu_context.h>
===== arch/ppc/mm/4xx_mmu.c 1.7 vs edited =====
--- 1.7/arch/ppc/mm/4xx_mmu.c	Fri Sep 12 17:26:52 2003
+++ edited/arch/ppc/mm/4xx_mmu.c	Mon Apr 19 13:40:33 2004
@@ -39,7 +39,6 @@
 #include <linux/bootmem.h>
 #include <linux/highmem.h>
 
-#include <asm/pgalloc.h>
 #include <asm/prom.h>
 #include <asm/io.h>
 #include <asm/mmu_context.h>
===== arch/ppc/mm/cachemap.c 1.14 vs edited =====
--- 1.14/arch/ppc/mm/cachemap.c	Thu Apr  1 20:45:32 2004
+++ edited/arch/ppc/mm/cachemap.c	Mon Apr 19 13:40:33 2004
@@ -37,7 +37,6 @@
 #include <linux/highmem.h>
 #include <linux/dma-mapping.h>
 
-#include <asm/pgalloc.h>
 #include <asm/prom.h>
 #include <asm/io.h>
 #include <asm/hardirq.h>
===== arch/ppc/mm/init.c 1.34 vs edited =====
--- 1.34/arch/ppc/mm/init.c	Thu Feb  5 05:11:47 2004
+++ edited/arch/ppc/mm/init.c	Mon Apr 19 13:40:33 2004
@@ -32,7 +32,6 @@
 #include <linux/highmem.h>
 #include <linux/initrd.h>
 
-#include <asm/pgalloc.h>
 #include <asm/prom.h>
 #include <asm/io.h>
 #include <asm/mmu_context.h>

Re: [PATCH] Clean up asm/pgalloc.h include (ppc64)

[Russell King]

This patch cleans up needless includes of asm/pgalloc.h from the
arch/ppc64/ 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/ppc64/mm/hugetlbpage.c 1.23 vs edited =====
--- 1.23/arch/ppc64/mm/hugetlbpage.c	Sat Apr 17 19:19:31 2004
+++ edited/arch/ppc64/mm/hugetlbpage.c	Mon Apr 19 13:41:03 2004
@@ -18,7 +18,6 @@
 #include <linux/err.h>
 #include <linux/sysctl.h>
 #include <asm/mman.h>
-#include <asm/pgalloc.h>
 #include <asm/tlb.h>
 #include <asm/tlbflush.h>
 #include <asm/mmu_context.h>
===== arch/ppc64/mm/imalloc.c 1.4 vs edited =====
--- 1.4/arch/ppc64/mm/imalloc.c	Fri Feb 27 05:25:17 2004
+++ edited/arch/ppc64/mm/imalloc.c	Mon Apr 19 13:41:03 2004
@@ -11,7 +11,6 @@
 #include <linux/vmalloc.h>
 
 #include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/semaphore.h>
 
===== arch/ppc64/mm/init.c 1.67 vs edited =====
--- 1.67/arch/ppc64/mm/init.c	Mon Apr 12 18:54:08 2004
+++ edited/arch/ppc64/mm/init.c	Mon Apr 19 13:41:03 2004
@@ -37,7 +37,6 @@
 #include <linux/bootmem.h>
 #include <linux/highmem.h>
 
-#include <asm/pgalloc.h>
 #include <asm/page.h>
 #include <asm/abs_addr.h>
 #include <asm/prom.h>

Re: [PATCH] Clean up asm/pgalloc.h include (s390)

[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.

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>
 

Re: [PATCH] Clean up asm/pgalloc.h include (sh)

[Russell King]

*** SH does not appear to have a maintainer listed ***

This patch cleans up needless includes of asm/pgalloc.h from the
arch/sh/ 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/sh/kernel/irq.c 1.17 vs edited =====
--- 1.17/arch/sh/kernel/irq.c	Fri Feb 13 15:19:28 2004
+++ edited/arch/sh/kernel/irq.c	Mon Apr 19 13:42:59 2004
@@ -35,7 +35,6 @@
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/bitops.h>
-#include <asm/pgalloc.h>
 #include <asm/delay.h>
 #include <asm/irq.h>
 #include <linux/irq.h>
===== arch/sh/mm/cache-sh3.c 1.11 vs edited =====
--- 1.11/arch/sh/mm/cache-sh3.c	Fri Feb 13 15:19:29 2004
+++ edited/arch/sh/mm/cache-sh3.c	Mon Apr 19 13:42:59 2004
@@ -17,7 +17,6 @@
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 #include <asm/mmu_context.h>
 #include <asm/cacheflush.h>
 
===== arch/sh/mm/cache-sh4.c 1.7 vs edited =====
--- 1.7/arch/sh/mm/cache-sh4.c	Tue Mar 23 10:05:27 2004
+++ edited/arch/sh/mm/cache-sh4.c	Mon Apr 19 13:42:59 2004
@@ -19,7 +19,6 @@
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 #include <asm/mmu_context.h>
 #include <asm/cacheflush.h>
 
===== arch/sh/mm/fault-nommu.c 1.1 vs edited =====
--- 1.1/arch/sh/mm/fault-nommu.c	Sun May  4 16:29:54 2003
+++ edited/arch/sh/mm/fault-nommu.c	Mon Apr 19 13:42:59 2004
@@ -25,7 +25,6 @@
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 #include <asm/hardirq.h>
 #include <asm/mmu_context.h>
 #include <asm/cacheflush.h>
===== arch/sh/mm/fault.c 1.12 vs edited =====
--- 1.12/arch/sh/mm/fault.c	Fri Feb 13 15:19:29 2004
+++ edited/arch/sh/mm/fault.c	Mon Apr 19 13:42:59 2004
@@ -25,7 +25,6 @@
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 #include <asm/hardirq.h>
 #include <asm/mmu_context.h>
 #include <asm/cacheflush.h>
===== arch/sh/mm/hugetlbpage.c 1.6 vs edited =====
--- 1.6/arch/sh/mm/hugetlbpage.c	Mon Apr 12 18:55:12 2004
+++ edited/arch/sh/mm/hugetlbpage.c	Mon Apr 19 13:42:59 2004
@@ -19,7 +19,6 @@
 #include <linux/sysctl.h>
 
 #include <asm/mman.h>
-#include <asm/pgalloc.h>
 #include <asm/tlb.h>
 #include <asm/tlbflush.h>
 #include <asm/cacheflush.h>
===== arch/sh/mm/init.c 1.17 vs edited =====
--- 1.17/arch/sh/mm/init.c	Tue Mar 23 10:05:27 2004
+++ edited/arch/sh/mm/init.c	Mon Apr 19 13:42:59 2004
@@ -30,7 +30,6 @@
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
-#include <asm/pgalloc.h>
 #include <asm/mmu_context.h>
 #include <asm/io.h>
 #include <asm/tlb.h>
===== arch/sh/mm/ioremap.c 1.8 vs edited =====
--- 1.8/arch/sh/mm/ioremap.c	Tue Mar 23 10:05:27 2004
+++ edited/arch/sh/mm/ioremap.c	Mon Apr 19 13:42:59 2004
@@ -13,7 +13,6 @@
 #include <linux/mm.h>
 #include <asm/io.h>
 #include <asm/page.h>
-#include <asm/pgalloc.h>
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
 
===== arch/sh/mm/pg-sh4.c 1.1 vs edited =====
--- 1.1/arch/sh/mm/pg-sh4.c	Sun May  4 16:29:55 2003
+++ edited/arch/sh/mm/pg-sh4.c	Mon Apr 19 13:42:59 2004
@@ -20,7 +20,6 @@
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 #include <asm/mmu_context.h>
 #include <asm/cacheflush.h>
 
===== arch/sh/mm/tlb-sh3.c 1.2 vs edited =====
--- 1.2/arch/sh/mm/tlb-sh3.c	Mon Jan 19 06:22:17 2004
+++ edited/arch/sh/mm/tlb-sh3.c	Mon Apr 19 13:42:59 2004
@@ -24,7 +24,6 @@
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 #include <asm/hardirq.h>
 #include <asm/mmu_context.h>
 #include <asm/cacheflush.h>
===== arch/sh/mm/tlb-sh4.c 1.2 vs edited =====
--- 1.2/arch/sh/mm/tlb-sh4.c	Tue Mar 23 10:05:26 2004
+++ edited/arch/sh/mm/tlb-sh4.c	Mon Apr 19 13:42:59 2004
@@ -24,7 +24,6 @@
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 #include <asm/hardirq.h>
 #include <asm/mmu_context.h>
 #include <asm/cacheflush.h>

Re: [PATCH] Clean up asm/pgalloc.h include (sparc)

[Russell King]

This patch cleans up needless includes of asm/pgalloc.h from the
arch/sparc/ 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/sparc/kernel/ioport.c 1.14 vs edited =====
--- 1.14/arch/sparc/kernel/ioport.c	Sun Mar 14 06:54:58 2004
+++ edited/arch/sparc/kernel/ioport.c	Mon Apr 19 13:44:22 2004
@@ -40,7 +40,6 @@
 #include <asm/vaddrs.h>
 #include <asm/oplib.h>
 #include <asm/page.h>
-#include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 
 #define mmu_inval_dma_area(p, l)	/* Anton pulled it out for 2.4.0-xx */
===== arch/sparc/kernel/irq.c 1.28 vs edited =====
--- 1.28/arch/sparc/kernel/irq.c	Sun Feb 22 22:34:53 2004
+++ edited/arch/sparc/kernel/irq.c	Mon Apr 19 13:44:22 2004
@@ -43,7 +43,6 @@
 #include <asm/traps.h>
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/hardirq.h>
 #include <asm/pcic.h>
===== arch/sparc/kernel/signal.c 1.27 vs edited =====
--- 1.27/arch/sparc/kernel/signal.c	Wed Mar 31 07:02:53 2004
+++ edited/arch/sparc/kernel/signal.c	Mon Apr 19 13:44:22 2004
@@ -25,7 +25,6 @@
 #include <asm/bitops.h>
 #include <asm/ptrace.h>
 #include <asm/svr4.h>
-#include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/cacheflush.h>	/* flush_sig_insns */
 
===== arch/sparc/kernel/smp.c 1.16 vs edited =====
--- 1.16/arch/sparc/kernel/smp.c	Tue Mar 16 10:14:48 2004
+++ edited/arch/sparc/kernel/smp.c	Mon Apr 19 13:44:22 2004
@@ -27,7 +27,6 @@
 
 #include <asm/irq.h>
 #include <asm/page.h>
-#include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/oplib.h>
 #include <asm/hardirq.h>
===== arch/sparc/kernel/sparc-stub.c 1.4 vs edited =====
--- 1.4/arch/sparc/kernel/sparc-stub.c	Fri Sep  6 06:16:41 2002
+++ edited/arch/sparc/kernel/sparc-stub.c	Mon Apr 19 13:44:22 2004
@@ -107,7 +107,6 @@
 #include <asm/traps.h>
 #include <asm/vac-ops.h>
 #include <asm/kgdb.h>
-#include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/cacheflush.h>
 
===== arch/sparc/kernel/sun4d_irq.c 1.19 vs edited =====
--- 1.19/arch/sparc/kernel/sun4d_irq.c	Mon Mar 15 00:43:39 2004
+++ edited/arch/sparc/kernel/sun4d_irq.c	Mon Apr 19 13:44:22 2004
@@ -34,7 +34,6 @@
 #include <asm/traps.h>
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/sbus.h>
 #include <asm/sbi.h>
===== arch/sparc/kernel/sun4d_smp.c 1.16 vs edited =====
--- 1.16/arch/sparc/kernel/sun4d_smp.c	Tue Mar 16 10:14:48 2004
+++ edited/arch/sparc/kernel/sun4d_smp.c	Mon Apr 19 13:44:22 2004
@@ -26,7 +26,6 @@
 #include <asm/delay.h>
 #include <asm/irq.h>
 #include <asm/page.h>
-#include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/oplib.h>
 #include <asm/hardirq.h>
===== arch/sparc/kernel/sun4m_irq.c 1.10 vs edited =====
--- 1.10/arch/sparc/kernel/sun4m_irq.c	Mon Mar 15 00:43:39 2004
+++ edited/arch/sparc/kernel/sun4m_irq.c	Mon Apr 19 13:44:22 2004
@@ -31,7 +31,6 @@
 #include <asm/openprom.h>
 #include <asm/oplib.h>
 #include <asm/traps.h>
-#include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/smp.h>
 #include <asm/irq.h>
===== arch/sparc/kernel/sun4m_smp.c 1.14 vs edited =====
--- 1.14/arch/sparc/kernel/sun4m_smp.c	Tue Mar 16 10:14:48 2004
+++ edited/arch/sparc/kernel/sun4m_smp.c	Mon Apr 19 13:44:22 2004
@@ -25,7 +25,6 @@
 #include <asm/delay.h>
 #include <asm/irq.h>
 #include <asm/page.h>
-#include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/oplib.h>
 #include <asm/hardirq.h>
===== arch/sparc/mm/btfixup.c 1.2 vs edited =====
--- 1.2/arch/sparc/mm/btfixup.c	Wed Jul 17 01:12:13 2002
+++ edited/arch/sparc/mm/btfixup.c	Mon Apr 19 13:44:22 2004
@@ -11,7 +11,6 @@
 #include <linux/init.h>
 #include <asm/btfixup.h>
 #include <asm/page.h>
-#include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/oplib.h>
 #include <asm/system.h>
===== arch/sparc/mm/generic.c 1.8 vs edited =====
--- 1.8/arch/sparc/mm/generic.c	Sat Oct  5 09:36:58 2002
+++ edited/arch/sparc/mm/generic.c	Mon Apr 19 13:44:22 2004
@@ -10,7 +10,6 @@
 #include <linux/swap.h>
 #include <linux/pagemap.h>
 
-#include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <asm/cacheflush.h>
===== arch/sparc/mm/highmem.c 1.4 vs edited =====
--- 1.4/arch/sparc/mm/highmem.c	Tue Jan  6 04:26:21 2004
+++ edited/arch/sparc/mm/highmem.c	Mon Apr 19 13:44:22 2004
@@ -24,7 +24,6 @@
  */
 #include <linux/mm.h>
 #include <linux/highmem.h>
-#include <asm/pgalloc.h>
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
 #include <asm/fixmap.h>
===== arch/sparc/mm/io-unit.c 1.8 vs edited =====
--- 1.8/arch/sparc/mm/io-unit.c	Tue Jan  6 04:26:21 2004
+++ edited/arch/sparc/mm/io-unit.c	Mon Apr 19 13:44:22 2004
@@ -13,7 +13,6 @@
 #include <linux/highmem.h>	/* pte_offset_map => kmap_atomic */
 
 #include <asm/scatterlist.h>
-#include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/sbus.h>
 #include <asm/io.h>
===== arch/sparc/mm/iommu.c 1.12 vs edited =====
--- 1.12/arch/sparc/mm/iommu.c	Tue Jan  6 04:26:21 2004
+++ edited/arch/sparc/mm/iommu.c	Mon Apr 19 13:44:22 2004
@@ -15,7 +15,6 @@
 #include <linux/highmem.h>	/* pte_offset_map => kmap_atomic */
 
 #include <asm/scatterlist.h>
-#include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/sbus.h>
 #include <asm/io.h>

Re: [PATCH] Clean up asm/pgalloc.h include (sparc64)

[Russell King]

This patch cleans up needless includes of asm/pgalloc.h from the
arch/sparc64/ 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/sparc64/kernel/binfmt_aout32.c 1.9 vs edited =====
--- 1.9/arch/sparc64/kernel/binfmt_aout32.c	Mon Apr 12 18:54:53 2004
+++ edited/arch/sparc64/kernel/binfmt_aout32.c	Mon Apr 19 13:45:03 2004
@@ -30,7 +30,6 @@
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 
 static int load_aout32_binary(struct linux_binprm *, struct pt_regs * regs);
 static int load_aout32_library(struct file*);
===== arch/sparc64/kernel/sparc64_ksyms.c 1.66 vs edited =====
--- 1.66/arch/sparc64/kernel/sparc64_ksyms.c	Tue Mar 30 23:23:37 2004
+++ edited/arch/sparc64/kernel/sparc64_ksyms.c	Mon Apr 19 13:45:03 2004
@@ -45,7 +45,6 @@
 #include <asm/uaccess.h>
 #include <asm/checksum.h>
 #include <asm/fpumacro.h>
-#include <asm/pgalloc.h>
 #include <asm/cacheflush.h>
 #ifdef CONFIG_SBUS
 #include <asm/sbus.h>
===== arch/sparc64/mm/generic.c 1.11 vs edited =====
--- 1.11/arch/sparc64/mm/generic.c	Thu Jun  6 11:27:18 2002
+++ edited/arch/sparc64/mm/generic.c	Mon Apr 19 13:45:03 2004
@@ -10,7 +10,6 @@
 #include <linux/swap.h>
 #include <linux/pagemap.h>
 
-#include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <asm/tlbflush.h>
===== arch/sparc64/mm/hugetlbpage.c 1.14 vs edited =====
--- 1.14/arch/sparc64/mm/hugetlbpage.c	Tue Apr 13 03:30:00 2004
+++ edited/arch/sparc64/mm/hugetlbpage.c	Mon Apr 19 13:45:03 2004
@@ -17,7 +17,6 @@
 #include <linux/module.h>
 
 #include <asm/mman.h>
-#include <asm/pgalloc.h>
 #include <asm/tlb.h>
 #include <asm/tlbflush.h>
 #include <asm/cacheflush.h>

Re: [PATCH] Clean up asm/pgalloc.h include (v850)

[Russell King]

This patch cleans up needless includes of asm/pgalloc.h from the
arch/v850/ 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/v850/kernel/signal.c 1.8 vs edited =====
--- 1.8/arch/v850/kernel/signal.c	Tue Feb 18 02:41:09 2003
+++ edited/arch/v850/kernel/signal.c	Mon Apr 19 13:45:30 2004
@@ -31,7 +31,6 @@
 #include <asm/ucontext.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
-#include <asm/pgalloc.h>
 #include <asm/thread_info.h>
 #include <asm/cacheflush.h>
 
===== arch/v850/kernel/v850_ksyms.c 1.4 vs edited =====
--- 1.4/arch/v850/kernel/v850_ksyms.c	Fri Jul 25 03:24:25 2003
+++ edited/arch/v850/kernel/v850_ksyms.c	Mon Apr 19 13:45:30 2004
@@ -9,7 +9,6 @@
 #include <linux/interrupt.h>
 #include <linux/config.h>
 
-#include <asm/pgalloc.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/semaphore.h>

Re: [PATCH] Clean up asm/pgalloc.h include (x86_64)

[Russell King]

This patch cleans up needless includes of asm/pgalloc.h from the
arch/x86_64/ 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/x86_64/ia32/ia32_aout.c 1.3 vs edited =====
--- 1.3/arch/x86_64/ia32/ia32_aout.c	Mon Apr 12 18:54:53 2004
+++ edited/arch/x86_64/ia32/ia32_aout.c	Mon Apr 19 13:46:36 2004
@@ -28,7 +28,6 @@
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 #include <asm/cacheflush.h>
 #include <asm/user32.h>
 
===== arch/x86_64/kernel/acpi/sleep.c 1.2 vs edited =====
--- 1.2/arch/x86_64/kernel/acpi/sleep.c	Wed Jan  7 07:25:08 2004
+++ edited/arch/x86_64/kernel/acpi/sleep.c	Mon Apr 19 13:46:36 2004
@@ -42,7 +42,6 @@
 #include <asm/apicdef.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
-#include <asm/pgalloc.h>
 #include <asm/io_apic.h>
 #include <asm/proto.h>
 #include <asm/tlbflush.h>
===== arch/x86_64/kernel/apic.c 1.28 vs edited =====
--- 1.28/arch/x86_64/kernel/apic.c	Thu Feb 26 23:55:11 2004
+++ edited/arch/x86_64/kernel/apic.c	Mon Apr 19 13:46:36 2004
@@ -31,7 +31,6 @@
 #include <asm/smp.h>
 #include <asm/mtrr.h>
 #include <asm/mpspec.h>
-#include <asm/pgalloc.h>
 
 int disable_apic_timer __initdata;
 
===== arch/x86_64/kernel/irq.c 1.22 vs edited =====
--- 1.22/arch/x86_64/kernel/irq.c	Thu Feb 19 03:42:58 2004
+++ edited/arch/x86_64/kernel/irq.c	Mon Apr 19 13:46:36 2004
@@ -40,7 +40,6 @@
 #include <asm/system.h>
 #include <asm/bitops.h>
 #include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 #include <asm/delay.h>
 #include <asm/desc.h>
 #include <asm/irq.h>
===== arch/x86_64/kernel/mpparse.c 1.25 vs edited =====
--- 1.25/arch/x86_64/kernel/mpparse.c	Mon Apr 12 18:53:56 2004
+++ edited/arch/x86_64/kernel/mpparse.c	Mon Apr 19 13:46:36 2004
@@ -27,7 +27,6 @@
 #include <asm/smp.h>
 #include <asm/mtrr.h>
 #include <asm/mpspec.h>
-#include <asm/pgalloc.h>
 #include <asm/io_apic.h>
 #include <asm/proto.h>
 
===== arch/x86_64/kernel/smp.c 1.18 vs edited =====
--- 1.18/arch/x86_64/kernel/smp.c	Sat Oct 25 22:35:55 2003
+++ edited/arch/x86_64/kernel/smp.c	Mon Apr 19 13:46:36 2004
@@ -22,7 +22,6 @@
 #include <linux/interrupt.h>
 
 #include <asm/mtrr.h>
-#include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
 
 /*
===== arch/x86_64/kernel/smpboot.c 1.26 vs edited =====
--- 1.26/arch/x86_64/kernel/smpboot.c	Wed Apr 14 03:46:21 2004
+++ edited/arch/x86_64/kernel/smpboot.c	Mon Apr 19 13:46:36 2004
@@ -47,7 +47,6 @@
 #include <linux/delay.h>
 #include <linux/mc146818rtc.h>
 #include <asm/mtrr.h>
-#include <asm/pgalloc.h>
 #include <asm/desc.h>
 #include <asm/kdebug.h>
 #include <asm/tlbflush.h>
===== arch/x86_64/kernel/traps.c 1.36 vs edited =====
--- 1.36/arch/x86_64/kernel/traps.c	Thu Mar 18 00:00:40 2004
+++ edited/arch/x86_64/kernel/traps.c	Mon Apr 19 13:46:36 2004
@@ -40,7 +40,6 @@
 #include <asm/processor.h>
 
 #include <asm/smp.h>
-#include <asm/pgalloc.h>
 #include <asm/pda.h>
 #include <asm/proto.h>
 
===== arch/x86_64/kernel/x8664_ksyms.c 1.30 vs edited =====
--- 1.30/arch/x86_64/kernel/x8664_ksyms.c	Wed Apr 14 03:46:21 2004
+++ edited/arch/x86_64/kernel/x8664_ksyms.c	Mon Apr 19 13:46:36 2004
@@ -27,7 +27,6 @@
 #include <asm/mmx.h>
 #include <asm/desc.h>
 #include <asm/pgtable.h>
-#include <asm/pgalloc.h>
 #include <asm/nmi.h>
 #include <asm/kdebug.h>
 #include <asm/unistd.h>
===== arch/x86_64/mm/fault.c 1.22 vs edited =====
--- 1.22/arch/x86_64/mm/fault.c	Mon Mar  8 14:23:47 2004
+++ edited/arch/x86_64/mm/fault.c	Mon Apr 19 13:46:36 2004
@@ -26,7 +26,6 @@
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 #include <asm/hardirq.h>
 #include <asm/smp.h>
 #include <asm/tlbflush.h>
===== arch/x86_64/mm/init.c 1.28 vs edited =====
--- 1.28/arch/x86_64/mm/init.c	Mon Apr 12 18:53:56 2004
+++ edited/arch/x86_64/mm/init.c	Mon Apr 19 13:46:36 2004
@@ -27,7 +27,6 @@
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
-#include <asm/pgalloc.h>
 #include <asm/dma.h>
 #include <asm/fixmap.h>
 #include <asm/e820.h>
===== arch/x86_64/mm/ioremap.c 1.11 vs edited =====
--- 1.11/arch/x86_64/mm/ioremap.c	Thu Oct  2 08:11:59 2003
+++ edited/arch/x86_64/mm/ioremap.c	Mon Apr 19 13:46:36 2004
@@ -12,7 +12,6 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <asm/io.h>
-#include <asm/pgalloc.h>
 #include <asm/fixmap.h>
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>

Re: [discuss] Re: [PATCH] Clean up asm/pgalloc.h include (x86_64)

[Andi Kleen]

On Mon, 19 Apr 2004 14:23:16 +0100
Russell King <rmk+lkml@arm.linux.org.uk> wrote:

> This patch cleans up needless includes of asm/pgalloc.h from the
> arch/x86_64/ 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


Compiles for me as SMP/NUMA and UP.

-Andi

Re: [PATCH] Clean up asm/pgalloc.h include (m68k)

[Geert Uytterhoeven]

On Mon, 19 Apr 2004, Russell King wrote:
> This patch cleans up needless includes of asm/pgalloc.h from the
> arch/m68k/ 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.

The patch below fixes all compile-issues on m68k, except when compiling for
Sun-3.

include/asm-generic/tlb.h now includes <asm/pgalloc.h>, which includes
<asm/sun3_pgalloc.h>. But the last file needs tlb_remove_page(), which is
defined in include/asm-generic/tlb.h

Do you really need <asm/pgalloc.h> in include/asm-generic/tlb.h? If yes, can it
be moved down, after the definition of tlb_remove_page()?

--- linux-m68k-2.6.6-rc1-rmk/arch/m68k/kernel/m68k_ksyms.c	2004-04-19 15:35:42.000000000 +0200
+++ linux-m68k-2.6.6-rc1-geert/arch/m68k/kernel/m68k_ksyms.c	2004-04-19 16:19:39.000000000 +0200
@@ -16,6 +16,7 @@
 #include <asm/semaphore.h>
 #include <asm/checksum.h>
 #include <asm/hardirq.h>
+#include <asm/cacheflush.h>

 asmlinkage long long __ashldi3 (long long, int);
 asmlinkage long long __ashrdi3 (long long, int);
--- linux-m68k-2.6.6-rc1-rmk/arch/m68k/kernel/traps.c	2004-04-19 15:35:42.000000000 +0200
+++ linux-m68k-2.6.6-rc1-geert/arch/m68k/kernel/traps.c	2004-04-19 15:53:54.000000000 +0200
@@ -39,6 +39,7 @@
 #include <asm/traps.h>
 #include <asm/machdep.h>
 #include <asm/siginfo.h>
+#include <asm/tlbflush.h>

 /* assembler routines */
 asmlinkage void system_call(void);
--- linux-m68k-2.6.6-rc1-rmk/arch/m68k/mm/kmap.c	2004-04-19 15:35:42.000000000 +0200
+++ linux-m68k-2.6.6-rc1-geert/arch/m68k/mm/kmap.c	2004-04-19 16:04:18.000000000 +0200
@@ -20,6 +20,7 @@
 #include <asm/page.h>
 #include <asm/io.h>
 #include <asm/system.h>
+#include <asm/tlbflush.h>

 #undef DEBUG

--- linux-m68k-2.6.6-rc1-rmk/arch/m68k/mm/memory.c	2004-04-19 15:35:42.000000000 +0200
+++ linux-m68k-2.6.6-rc1-geert/arch/m68k/mm/memory.c	2004-04-19 16:04:46.000000000 +0200
@@ -19,6 +19,7 @@
 #include <asm/system.h>
 #include <asm/traps.h>
 #include <asm/machdep.h>
+#include <asm/tlbflush.h>


 /* ++andreas: {get,free}_pointer_table rewritten to use unused fields from
--- linux-m68k-2.6.6-rc1-rmk/arch/m68k/mm/motorola.c	2004-04-19 15:35:42.000000000 +0200
+++ linux-m68k-2.6.6-rc1-geert/arch/m68k/mm/motorola.c	2004-04-19 16:05:22.000000000 +0200
@@ -30,6 +30,8 @@
 #ifdef CONFIG_ATARI
 #include <asm/atari_stram.h>
 #endif
+#include <asm/tlbflush.h>
+#include <asm/cacheflush.h>

 #undef DEBUG

--- linux-m68k-2.6.6-rc1-rmk/arch/m68k/sun3x/dvma.c	2004-04-19 15:35:42.000000000 +0200
+++ linux-m68k-2.6.6-rc1-geert/arch/m68k/sun3x/dvma.c	2004-04-19 17:38:35.000000000 +0200
@@ -23,6 +23,7 @@
 #include <asm/io.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
+#include <asm/tlbflush.h>

 /* IOMMU support */

--- linux-m68k-2.6.6-rc1-rmk/include/asm-m68k/motorola_pgalloc.h	2003-05-06 14:08:25.000000000 +0200
+++ linux-m68k-2.6.6-rc1-geert/include/asm-m68k/motorola_pgalloc.h	2004-04-19 15:50:33.000000000 +0200
@@ -1,6 +1,7 @@
 #ifndef _MOTOROLA_PGALLOC_H
 #define _MOTOROLA_PGALLOC_H

+#include <asm/tlbflush.h>
 #include <asm/tlb.h>

 extern pmd_t *get_pointer_table(void);

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: [PATCH] Clean up asm/pgalloc.h include (m68k)

[Russell King]

On Mon, Apr 19, 2004 at 06:18:41PM +0200, Geert Uytterhoeven wrote:
> The patch below fixes all compile-issues on m68k, except when compiling for
> Sun-3.
> 
> include/asm-generic/tlb.h now includes <asm/pgalloc.h>, which includes
> <asm/sun3_pgalloc.h>. But the last file needs tlb_remove_page(), which is
> defined in include/asm-generic/tlb.h

Nice.

> Do you really need <asm/pgalloc.h> in include/asm-generic/tlb.h?

Yes it does - tlb.h uses check_pgt_cache().  Also, architecture code
makes use of __pmd_free_tlb and __pte_free_tlb, both of which make
use of code from asm/pgalloc.h.

Not including asm/pgalloc.h into asm/tlb.h or asm-generic/tlb.h means
that all the generic files have to know that asm/tlb.h needs asm/pgalloc.h,
and they also then need to know that asm/pgalloc.h needs asm/pgtable.h,
and asm/pgtable.h needs ...

Is there a reason why:

static inline void __pte_free_tlb(struct mmu_gather *tlb, struct page *page)
{
        tlb_remove_page(tlb, page);
}

can't be like x86 and others in their pgalloc.h:

#define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte))

(for consistency sake if nothing else) ?

Thanks.

-- 
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

Re: [PATCH] Clean up asm/pgalloc.h include (mips)

[Ralf Baechle]

On Mon, Apr 19, 2004 at 02:21:47PM +0100, Russell King wrote:

> This patch cleans up needless includes of asm/pgalloc.h from the
> arch/mips/ 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.

It needed a little fixing for one because of recent changed to the IP27
code and to keep things building.  The updated patch against linux-mips.org's
cvs which I'm about to checkin, is below.

  Ralf

Index: arch/mips/baget/baget.c
===================================================================
RCS file: /home/cvs/linux/arch/mips/baget/baget.c,v
retrieving revision 1.4
diff -u -r1.4 baget.c
--- arch/mips/baget/baget.c	6 Aug 2002 00:08:53 -0000	1.4
+++ arch/mips/baget/baget.c	19 Apr 2004 16:28:55 -0000
@@ -12,7 +12,6 @@
 #include <asm/bootinfo.h>
 #include <asm/mipsregs.h>
 #include <asm/pgtable.h>
-#include <asm/pgalloc.h>
 
 #include <asm/baget/baget.h>
 
Index: arch/mips/kernel/irixelf.c
===================================================================
RCS file: /home/cvs/linux/arch/mips/kernel/irixelf.c,v
retrieving revision 1.54
diff -u -r1.54 irixelf.c
--- arch/mips/kernel/irixelf.c	19 Oct 2003 00:50:08 -0000	1.54
+++ arch/mips/kernel/irixelf.c	19 Apr 2004 16:28:58 -0000
@@ -31,7 +31,6 @@
 #include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 #include <asm/mipsregs.h>
 #include <asm/prctl.h>
 
Index: arch/mips/kernel/signal32.c
===================================================================
RCS file: /home/cvs/linux/arch/mips/kernel/signal32.c,v
retrieving revision 1.10
diff -u -r1.10 signal32.c
--- arch/mips/kernel/signal32.c	11 Mar 2004 16:46:43 -0000	1.10
+++ arch/mips/kernel/signal32.c	19 Apr 2004 16:28:58 -0000
@@ -21,7 +21,6 @@
 
 #include <asm/asm.h>
 #include <asm/bitops.h>
-#include <asm/pgalloc.h>
 #include <asm/sim.h>
 #include <asm/uaccess.h>
 #include <asm/ucontext.h>
Index: arch/mips/kernel/signal_n32.c
===================================================================
RCS file: /home/cvs/linux/arch/mips/kernel/signal_n32.c,v
retrieving revision 1.4
diff -u -r1.4 signal_n32.c
--- arch/mips/kernel/signal_n32.c	3 Mar 2004 12:54:20 -0000	1.4
+++ arch/mips/kernel/signal_n32.c	19 Apr 2004 16:28:58 -0000
@@ -29,7 +29,6 @@
 
 #include <asm/asm.h>
 #include <asm/bitops.h>
-#include <asm/pgalloc.h>
 #include <asm/sim.h>
 #include <asm/uaccess.h>
 #include <asm/ucontext.h>
Index: arch/mips/kernel/sysirix.c
===================================================================
RCS file: /home/cvs/linux/arch/mips/kernel/sysirix.c,v
retrieving revision 1.58
diff -u -r1.58 sysirix.c
--- arch/mips/kernel/sysirix.c	12 Apr 2004 20:23:24 -0000	1.58
+++ arch/mips/kernel/sysirix.c	19 Apr 2004 16:28:58 -0000
@@ -33,7 +33,6 @@
 
 #include <asm/ptrace.h>
 #include <asm/page.h>
-#include <asm/pgalloc.h>
 #include <asm/uaccess.h>
 #include <asm/inventory.h>
 
Index: arch/mips/mm/fault.c
===================================================================
RCS file: /home/cvs/linux/arch/mips/mm/fault.c,v
retrieving revision 1.52
diff -u -r1.52 fault.c
--- arch/mips/mm/fault.c	18 Dec 2003 21:52:33 -0000	1.52
+++ arch/mips/mm/fault.c	19 Apr 2004 16:28:58 -0000
@@ -22,7 +22,6 @@
 
 #include <asm/branch.h>
 #include <asm/hardirq.h>
-#include <asm/pgalloc.h>
 #include <asm/mmu_context.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
Index: arch/mips/mm/init.c
===================================================================
RCS file: /home/cvs/linux/arch/mips/mm/init.c,v
retrieving revision 1.67
diff -u -r1.67 init.c
--- arch/mips/mm/init.c	19 Mar 2004 01:26:10 -0000	1.67
+++ arch/mips/mm/init.c	19 Apr 2004 16:28:58 -0000
@@ -29,9 +29,10 @@
 #include <asm/cachectl.h>
 #include <asm/cpu.h>
 #include <asm/dma.h>
-#include <asm/pgalloc.h>
 #include <asm/mmu_context.h>
 #include <asm/sections.h>
+#include <asm/pgtable.h>
+#include <asm/pgalloc.h>
 #include <asm/tlb.h>
 
 DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
Index: arch/mips/mm/ioremap.c
===================================================================
RCS file: /home/cvs/linux/arch/mips/mm/ioremap.c,v
retrieving revision 1.18
diff -u -r1.18 ioremap.c
--- arch/mips/mm/ioremap.c	25 Feb 2004 22:09:29 -0000	1.18
+++ arch/mips/mm/ioremap.c	19 Apr 2004 16:28:58 -0000
@@ -13,7 +13,6 @@
 #include <linux/vmalloc.h>
 #include <asm/cacheflush.h>
 #include <asm/io.h>
-#include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
 
 static inline void remap_area_pte(pte_t * pte, unsigned long address,
Index: arch/mips/mm/pgtable-64.c
===================================================================
RCS file: /home/cvs/linux/arch/mips/mm/pgtable-64.c,v
retrieving revision 1.3
diff -u -r1.3 pgtable-64.c
--- arch/mips/mm/pgtable-64.c	27 Aug 2003 17:10:00 -0000	1.3
+++ arch/mips/mm/pgtable-64.c	19 Apr 2004 16:28:58 -0000
@@ -9,7 +9,6 @@
 #include <linux/init.h>
 #include <linux/mm.h>
 #include <asm/pgtable.h>
-#include <asm/pgalloc.h>
 
 void pgd_init(unsigned long page)
 {
Index: arch/mips/sgi-ip27/ip27-init.c
===================================================================
RCS file: /home/cvs/linux/arch/mips/sgi-ip27/ip27-init.c,v
retrieving revision 1.58
diff -u -r1.58 ip27-init.c
--- arch/mips/sgi-ip27/ip27-init.c	12 Apr 2004 20:23:25 -0000	1.58
+++ arch/mips/sgi-ip27/ip27-init.c	19 Apr 2004 16:29:00 -0000
@@ -15,7 +15,6 @@
 #include <linux/cpumask.h>
 #include <asm/cpu.h>
 #include <asm/io.h>
-#include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/time.h>
 #include <asm/sn/types.h>
Index: include/asm-mips/pgalloc.h
===================================================================
RCS file: /home/cvs/linux/include/asm-mips/pgalloc.h,v
retrieving revision 1.30
diff -u -r1.30 pgalloc.h
--- include/asm-mips/pgalloc.h	14 Aug 2003 15:54:42 -0000	1.30
+++ include/asm-mips/pgalloc.h	19 Apr 2004 16:29:02 -0000
@@ -122,12 +122,6 @@
 
 #endif
 
-/*
- * Used for the b0rked handling of kernel pagetables on the 64-bit kernel.
- */
-extern pte_t kptbl[(PAGE_SIZE << PGD_ORDER)/sizeof(pte_t)];
-extern pmd_t kpmdtbl[PTRS_PER_PMD];
-
 #define check_pgt_cache()	do { } while (0)
 
 #endif /* _ASM_PGALLOC_H */
Index: include/asm-mips/pgtable-64.h
===================================================================
RCS file: /home/cvs/linux/include/asm-mips/pgtable-64.h,v
retrieving revision 1.11
diff -u -r1.11 pgtable-64.h
--- include/asm-mips/pgtable-64.h	5 Jan 2004 23:29:13 -0000	1.11
+++ include/asm-mips/pgtable-64.h	19 Apr 2004 16:29:02 -0000
@@ -216,4 +216,10 @@
 
 typedef pte_t *pte_addr_t;
 
+/*
+ * Used for the b0rked handling of kernel pagetables on the 64-bit kernel.
+ */
+extern pte_t kptbl[(PAGE_SIZE << PGD_ORDER)/sizeof(pte_t)];
+extern pmd_t kpmdtbl[PTRS_PER_PMD];
+
 #endif /* _ASM_PGTABLE_64_H */

Re: [PATCH] Clean up asm/pgalloc.h include (m68k)

[Russell King]

On Mon, Apr 19, 2004 at 06:18:41PM +0200, Geert Uytterhoeven wrote:
> --- linux-m68k-2.6.6-rc1-rmk/arch/m68k/kernel/m68k_ksyms.c	2004-04-19 15:35:42.000000000 +0200
> +++ linux-m68k-2.6.6-rc1-geert/arch/m68k/kernel/m68k_ksyms.c	2004-04-19 16:19:39.000000000 +0200
> @@ -16,6 +16,7 @@
>...

Patch merged into existing m68k patch, thanks.  I'll wait for
sun3_pgalloc.h to be resolved before posting an updated patch
though.

-- 
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

Re: [PATCH] Clean up asm/pgalloc.h include (m68k)

[Geert Uytterhoeven]

On Mon, 19 Apr 2004, Russell King wrote:
> On Mon, Apr 19, 2004 at 06:18:41PM +0200, Geert Uytterhoeven wrote:
> > Do you really need <asm/pgalloc.h> in include/asm-generic/tlb.h?
>
> Yes it does - tlb.h uses check_pgt_cache().  Also, architecture code
> makes use of __pmd_free_tlb and __pte_free_tlb, both of which make
> use of code from asm/pgalloc.h.
>
> Not including asm/pgalloc.h into asm/tlb.h or asm-generic/tlb.h means
> that all the generic files have to know that asm/tlb.h needs asm/pgalloc.h,
> and they also then need to know that asm/pgalloc.h needs asm/pgtable.h,
> and asm/pgtable.h needs ...
>
> Is there a reason why:
>
> static inline void __pte_free_tlb(struct mmu_gather *tlb, struct page *page)
> {
>         tlb_remove_page(tlb, page);
> }
>
> can't be like x86 and others in their pgalloc.h:

(because we more like static inline functions than macros?)

> #define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte))
>
> (for consistency sake if nothing else) ?

Ah, I didn't look at ia32. That solution is fine for me!
Here's the additional patch:

--- linux-m68k-2.6.6-rc1-rmk/include/asm-m68k/sun3_pgalloc.h	2004-04-04 11:08:37.000000000 +0200
+++ linux-m68k-2.6.6-rc1-geert/include/asm-m68k/sun3_pgalloc.h	2004-04-19 18:37:37.000000000 +0200
@@ -31,10 +31,7 @@
         __free_page(page);
 }

-static inline void __pte_free_tlb(struct mmu_gather *tlb, struct page *page)
-{
-	tlb_remove_page(tlb, page);
-}
+#define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte))

 static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
 					  unsigned long address)

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: [PATCH] Clean up asm/pgalloc.h include (alpha)

[Ivan Kokshaysky]

On Mon, Apr 19, 2004 at 02:20:36PM +0100, Russell King wrote:
> This patch cleans up needless includes of asm/pgalloc.h from the
> arch/alpha/ subtree.  This has not been compile tested, so
> needs the architecture maintainers (or willing volunteers) to
> test.

This compiles cleanly. Thanks.

Ivan.

Re: [PATCH] Clean up asm/pgalloc.h include (ia64)

[Alex Williamson]

On Mon, 2004-04-19 at 07:21, Russell King wrote:
> This patch cleans up needless includes of asm/pgalloc.h from the
> arch/ia64/ 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.

Russell,

   On ia64, the show_mem sysrq wants to print pgtable_cache_size. 
asm-ia64/tlb.h including asm/pgalloc.h was hiding this for the
discontig, NUMA build, but the contig memory build was blowing up. 
Unless someone is desperately attached to printing out the number of
pages in page table cache, I think we can just drop it.  The patch below
replaces your patches for arch/ia64/contig.c, discontig.c and adds a
chunk for asm-ia64/tlb.h to get rid of the pgalloc.h include there. 
Built and booted NUMA and non-NUMA configs.  Thanks,

	Alex

===== arch/ia64/mm/discontig.c 1.13 vs edited =====
--- 1.13/arch/ia64/mm/discontig.c	Thu Mar 11 23:15:26 2004
+++ edited/arch/ia64/mm/discontig.c	Mon Apr 19 14:36:36 2004
@@ -16,7 +16,6 @@
 #include <linux/bootmem.h>
 #include <linux/acpi.h>
 #include <linux/efi.h>
-#include <asm/pgalloc.h>
 #include <asm/tlb.h>
 #include <asm/meminit.h>
 #include <asm/numa.h>
@@ -513,7 +512,6 @@
 		printk("\t%d pages shared\n", shared);
 		printk("\t%d pages swap cached\n", cached);
 	}
-	printk("Total of %ld pages in page table cache\n", pgtable_cache_size);
 	printk("%d free buffer pages\n", nr_free_buffer_pages());
 }
 
===== arch/ia64/mm/contig.c 1.4 vs edited =====
--- 1.4/arch/ia64/mm/contig.c	Thu Mar 11 22:59:24 2004
+++ edited/arch/ia64/mm/contig.c	Mon Apr 19 14:28:51 2004
@@ -21,7 +21,6 @@
 #include <linux/swap.h>
 
 #include <asm/meminit.h>
-#include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/sections.h>
 
@@ -60,7 +59,6 @@
 	printk("%d reserved pages\n", reserved);
 	printk("%d pages shared\n", shared);
 	printk("%d pages swap cached\n", cached);
-	printk("%ld pages in page table cache\n", pgtable_cache_size);
 }
 
 /* physical address where the bootmem map is located */
===== include/asm-ia64/tlb.h 1.19 vs edited =====
--- 1.19/include/asm-ia64/tlb.h	Mon Feb 23 13:02:43 2004
+++ edited/include/asm-ia64/tlb.h	Mon Apr 19 14:27:13 2004
@@ -41,9 +41,10 @@
 #include <linux/mm.h>
 #include <linux/swap.h>
 
-#include <asm/pgalloc.h>
 #include <asm/processor.h>
 #include <asm/tlbflush.h>
+
+extern void check_pgt_cache(void);
 
 #ifdef CONFIG_SMP
 # define FREE_PTE_NR		2048

Re: [PATCH] Clean up asm/pgalloc.h include (sh)

[Paul Mundt]

[-- Attachment #1: Type: text/plain, Size: 4208 bytes --]

On Mon, Apr 19, 2004 at 02:22:42PM +0100, Russell King wrote:
> 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.
> 
Failed to compile. sh has ptep_get_and_clear in asm/pgalloc.h.

This moves it out of the way, and your patch builds fine.

--- orig/arch/sh/mm/tlb-sh4.c
+++ mod/arch/sh/mm/tlb-sh4.c
@@ -24,7 +24,6 @@
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 #include <asm/hardirq.h>
 #include <asm/mmu_context.h>
 #include <asm/cacheflush.h>
@@ -95,3 +94,24 @@
 	back_to_P1();
 }
 
+/*
+ * For SH-4, we have our own implementation for ptep_get_and_clear
+ */
+inline pte_t ptep_get_and_clear(pte_t *ptep)
+{
+	pte_t pte = *ptep;
+
+	pte_clear(ptep);
+	if (!pte_not_present(pte)) {
+		struct page *page;
+		unsigned long pfn = pte_pfn(pte);
+		if (pfn_valid(pfn)) {
+			page = pfn_to_page(pfn);
+			if (!page->mapping
+			    || list_empty(&page->mapping->i_mmap_shared))
+				__clear_bit(PG_mapped, &page->flags);
+		}
+	}
+	return pte;
+}
+
--- orig/include/asm-sh/pgtable.h
+++ mod/include/asm-sh/pgtable.h
@@ -268,16 +268,6 @@
 #define pte_to_pgoff(pte)	(pte_val(pte) >> 1)
 #define pgoff_to_pte(off)	((pte_t) { ((off) << 1) | _PAGE_FILE })
 
-/*
- * Routines for update of PTE 
- *
- * We just can use generic implementation, as SuperH has no SMP feature.
- * (We needed atomic implementation for SMP)
- *
- */
-
-#define pte_same(A,B)	(pte_val(A) == pte_val(B))
-
 typedef pte_t *pte_addr_t;
 
 #endif /* !__ASSEMBLY__ */
@@ -295,12 +285,11 @@
 extern unsigned int kobjsize(const void *objp);
 #endif /* !CONFIG_MMU */
 
-#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
-#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY
+#ifdef CONFIG_CPU_SH4
 #define __HAVE_ARCH_PTEP_GET_AND_CLEAR
-#define __HAVE_ARCH_PTEP_SET_WRPROTECT
-#define __HAVE_ARCH_PTEP_MKDIRTY
-#define __HAVE_ARCH_PTE_SAME
+extern inline pte_t ptep_get_and_clear(pte_t *ptep);
+#endif
+
 #include <asm-generic/pgtable.h>
 
 #endif /* __ASM_SH_PAGE_H */
--- orig/include/asm-sh/pgalloc.h
+++ mod/include/asm-sh/pgalloc.h
@@ -85,71 +85,12 @@
 #define __pmd_free_tlb(tlb,x)		do { } while (0)
 #define pgd_populate(mm, pmd, pte)	BUG()
 
-#if defined(CONFIG_CPU_SH4)
-#define PG_mapped	PG_arch_1
+#define check_pgt_cache()	do { } while (0)
 
-/*
- * For SH-4, we have our own implementation for ptep_get_and_clear
- */
-static inline pte_t ptep_get_and_clear(pte_t *ptep)
-{
-	pte_t pte = *ptep;
+#ifdef CONFIG_CPU_SH4
+#define PG_mapped	PG_arch_1
 
-	pte_clear(ptep);
-	if (!pte_not_present(pte)) {
-		struct page *page;
-		unsigned long pfn = pte_pfn(pte);
-		if (pfn_valid(pfn)) {
-			page = pfn_to_page(pfn);
-			if (!page->mapping
-			    || list_empty(&page->mapping->i_mmap_shared))
-				__clear_bit(PG_mapped, &page->flags);
-		}
-	}
-	return pte;
-}
-#else
-static inline pte_t ptep_get_and_clear(pte_t *ptep)
-{
-	pte_t pte = *ptep;
-	pte_clear(ptep);
-	return pte;
-}
+extern inline pte_t ptep_get_and_clear(pte_t *ptep);
 #endif
 
-/*
- * Following functions are same as generic ones.
- */
-static inline int ptep_test_and_clear_young(pte_t *ptep)
-{
-	pte_t pte = *ptep;
-	if (!pte_young(pte))
-		return 0;
-	set_pte(ptep, pte_mkold(pte));
-	return 1;
-}
-
-static inline int ptep_test_and_clear_dirty(pte_t *ptep)
-{
-	pte_t pte = *ptep;
-	if (!pte_dirty(pte))
-		return 0;
-	set_pte(ptep, pte_mkclean(pte));
-	return 1;
-}
-
-static inline void ptep_set_wrprotect(pte_t *ptep)
-{
-	pte_t old_pte = *ptep;
-	set_pte(ptep, pte_wrprotect(old_pte));
-}
-
-static inline void ptep_mkdirty(pte_t *ptep)
-{
-	pte_t old_pte = *ptep;
-	set_pte(ptep, pte_mkdirty(old_pte));
-}
-
-#define check_pgt_cache()	do { } while (0)
-
 #endif /* __ASM_SH_PGALLOC_H */

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH] Clean up asm/pgalloc.h include (sh)

[Hugh Dickins]

On Tue, 20 Apr 2004, Paul Mundt wrote:
> Failed to compile. sh has ptep_get_and_clear in asm/pgalloc.h.
> This moves it out of the way, and your patch builds fine.

Paul, the patch you show reflects how ptep_get_and_clear looked in
2.6.5, but not how it now looks in 2.6.6-rc1-bk - should be using
page_mapping(page) and mapping_writably_mapped(mapping).

I dare say you're referring to a master tree into which the recent
mainline changes need to be ported (I CC'ed gniibe@m17n.org when
sending those changes to akpm): I'm not saying your version is
wrong, just trying to make sure that two sets of changes in the
same area don't end up with one set getting lost.

Hugh

Re: [PATCH] Clean up asm/pgalloc.h include (sh)

[Paul Mundt]

[-- Attachment #1: Type: text/plain, Size: 4829 bytes --]

On Tue, Apr 20, 2004 at 05:01:17PM +0100, Hugh Dickins wrote:
> On Tue, 20 Apr 2004, Paul Mundt wrote:
> > Failed to compile. sh has ptep_get_and_clear in asm/pgalloc.h.
> > This moves it out of the way, and your patch builds fine.
> 
> Paul, the patch you show reflects how ptep_get_and_clear looked in
> 2.6.5, but not how it now looks in 2.6.6-rc1-bk - should be using
> page_mapping(page) and mapping_writably_mapped(mapping).
> 
> I dare say you're referring to a master tree into which the recent
> mainline changes need to be ported (I CC'ed gniibe@m17n.org when
> sending those changes to akpm): I'm not saying your version is
> wrong, just trying to make sure that two sets of changes in the
> same area don't end up with one set getting lost.
> 
Yes, this was against the 2.6.5-based SH tree, not current BK. Attached
is a patch against current BK that seems to reflect your changes.

Please CC me on any future SH-related issues, NIIBE-san is no longer
active in the SH community.

===== arch/sh/mm/tlb-sh4.c 1.2 vs edited =====
--- 1.2/arch/sh/mm/tlb-sh4.c	Tue Mar 23 05:05:26 2004
+++ edited/arch/sh/mm/tlb-sh4.c	Tue Apr 20 12:16:08 2004
@@ -24,7 +24,6 @@
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 #include <asm/hardirq.h>
 #include <asm/mmu_context.h>
 #include <asm/cacheflush.h>
@@ -93,5 +92,25 @@
 	jump_to_P2();
 	ctrl_outl(data, addr);
 	back_to_P1();
+}
+
+/*
+ * For SH-4, we have our own implementation for ptep_get_and_clear
+ */
+inline pte_t ptep_get_and_clear(pte_t *ptep)
+{
+	pte_t pte = *ptep;
+
+	pte_clear(ptep);
+	if (!pte_not_present(pte)) {
+		unsigned long pfn = pte_pfn(pte);
+		if (pfn_valid(pfn)) {
+			struct page *page = pfn_to_page(pfn);
+			struct address_space *mapping = page_mapping(page);
+			if (!mapping || !mapping_writably_mapped(mapping))
+				__clear_bit(PG_mapped, &page->flags);
+		}
+	}
+	return pte;
 }
 
===== include/asm-sh/pgalloc.h 1.12 vs edited =====
--- 1.12/include/asm-sh/pgalloc.h	Sun Apr 18 12:13:10 2004
+++ edited/include/asm-sh/pgalloc.h	Tue Apr 20 12:17:20 2004
@@ -85,69 +85,9 @@
 #define __pmd_free_tlb(tlb,x)		do { } while (0)
 #define pgd_populate(mm, pmd, pte)	BUG()
 
-#if defined(CONFIG_CPU_SH4)
+#ifdef CONFIG_CPU_SH4
 #define PG_mapped	PG_arch_1
-
-/*
- * For SH-4, we have our own implementation for ptep_get_and_clear
- */
-static inline pte_t ptep_get_and_clear(pte_t *ptep)
-{
-	pte_t pte = *ptep;
-
-	pte_clear(ptep);
-	if (!pte_not_present(pte)) {
-		unsigned long pfn = pte_pfn(pte);
-		if (pfn_valid(pfn)) {
-			struct page *page = pfn_to_page(pfn);
-			struct address_space *mapping = page_mapping(page);
-			if (!mapping || !mapping_writably_mapped(mapping))
-				__clear_bit(PG_mapped, &page->flags);
-		}
-	}
-	return pte;
-}
-#else
-static inline pte_t ptep_get_and_clear(pte_t *ptep)
-{
-	pte_t pte = *ptep;
-	pte_clear(ptep);
-	return pte;
-}
 #endif
-
-/*
- * Following functions are same as generic ones.
- */
-static inline int ptep_test_and_clear_young(pte_t *ptep)
-{
-	pte_t pte = *ptep;
-	if (!pte_young(pte))
-		return 0;
-	set_pte(ptep, pte_mkold(pte));
-	return 1;
-}
-
-static inline int ptep_test_and_clear_dirty(pte_t *ptep)
-{
-	pte_t pte = *ptep;
-	if (!pte_dirty(pte))
-		return 0;
-	set_pte(ptep, pte_mkclean(pte));
-	return 1;
-}
-
-static inline void ptep_set_wrprotect(pte_t *ptep)
-{
-	pte_t old_pte = *ptep;
-	set_pte(ptep, pte_wrprotect(old_pte));
-}
-
-static inline void ptep_mkdirty(pte_t *ptep)
-{
-	pte_t old_pte = *ptep;
-	set_pte(ptep, pte_mkdirty(old_pte));
-}
 
 #define check_pgt_cache()	do { } while (0)
 
===== include/asm-sh/pgtable.h 1.22 vs edited =====
--- 1.22/include/asm-sh/pgtable.h	Tue Mar 23 05:05:27 2004
+++ edited/include/asm-sh/pgtable.h	Tue Apr 20 12:13:49 2004
@@ -264,16 +264,6 @@
 #define pte_to_pgoff(pte)	(pte_val(pte))
 #define pgoff_to_pte(off)	((pte_t) { (off) | _PAGE_FILE })
 
-/*
- * Routines for update of PTE 
- *
- * We just can use generic implementation, as SuperH has no SMP feature.
- * (We needed atomic implementation for SMP)
- *
- */
-
-#define pte_same(A,B)	(pte_val(A) == pte_val(B))
-
 typedef pte_t *pte_addr_t;
 
 #endif /* !__ASSEMBLY__ */
@@ -291,12 +281,11 @@
 extern unsigned int kobjsize(const void *objp);
 #endif /* !CONFIG_MMU */
 
-#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
-#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY
+#ifdef CONFIG_CPU_SH4
 #define __HAVE_ARCH_PTEP_GET_AND_CLEAR
-#define __HAVE_ARCH_PTEP_SET_WRPROTECT
-#define __HAVE_ARCH_PTEP_MKDIRTY
-#define __HAVE_ARCH_PTE_SAME
+extern inline pte_t ptep_get_and_clear(pte_t *ptep);
+#endif
+
 #include <asm-generic/pgtable.h>
 
 #endif /* __ASM_SH_PAGE_H */

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH] Clean up asm/pgalloc.h include (ppc)

[Tom Rini]

On Mon, Apr 19, 2004 at 02:22:10PM +0100, Russell King wrote:

> This patch cleans up needless includes of asm/pgalloc.h from the
> arch/ppc/ 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.

Better late than never I hope, this is fine on ppc32.

-- 
Tom Rini
http://gate.crashing.org/~trini/