Clean up asm/pgalloc.h include
Subsystems (28)
PATCH 1/2 Clean up asm/pgalloc.h include
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(-)
fs/binfmt_aout.c +0 -1
@@ -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);
fs/binfmt_elf.c +0 -1
@@ -40,7 +40,6 @@#include <asm/uaccess.h> #include <asm/param.h> -#include <asm/pgalloc.h> #include <linux/elf.h>
fs/binfmt_flat.c +0 -1
@@ -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>
fs/exec.c +0 -1
@@ -48,7 +48,6 @@#include <linux/rmap.h> #include <asm/uaccess.h> -#include <asm/pgalloc.h> #include <asm/mmu_context.h> #ifdef CONFIG_KMOD
fs/proc/proc_misc.c +0 -1
@@ -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>
kernel/module.c +0 -1
@@ -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
include/asm-arm26/tlb.h +1 -0
@@ -1,6 +1,7 @@#ifndef __ASMARM_TLB_H#define __ASMARM_TLB_H +#include <asm/pgalloc.h> #include <asm/tlbflush.h> /*
include/asm-generic/tlb.h +1 -0
@@ -15,6 +15,7 @@#include <linux/config.h> #include <linux/swap.h> +#include <asm/pgalloc.h> #include <asm/tlbflush.h> /*
mm/highmem.c +0 -1
@@ -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;
mm/mincore.c +0 -1
@@ -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.
mm/mmap.c +0 -1
@@ -23,7 +23,6 @@#include <linux/mount.h> #include <asm/uaccess.h> -#include <asm/pgalloc.h> #include <asm/tlb.h> /*
mm/mprotect.c +0 -1
@@ -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>
mm/mremap.c +0 -1
@@ -19,7 +19,6 @@#include <linux/security.h> #include <asm/uaccess.h> -#include <asm/pgalloc.h> #include <asm/cacheflush.h> #include <asm/tlbflush.h>
mm/msync.c +0 -1
@@ -13,7 +13,6 @@#include <linux/mman.h> #include <asm/pgtable.h> -#include <asm/pgalloc.h> #include <asm/tlbflush.h> /*
mm/nommu.c +0 -1
@@ -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>
mm/rmap.c +0 -1
@@ -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>
mm/vmalloc.c +0 -1
@@ -17,7 +17,6 @@#include <linux/vmalloc.h> #include <asm/uaccess.h> -#include <asm/pgalloc.h> #include <asm/tlbflush.h>
mm/vmscan.c +0 -1
@@ -33,7 +33,6 @@#include <linux/cpu.h> #include <linux/notifier.h> -#include <asm/pgalloc.h> #include <asm/tlbflush.h> #include <asm/div64.h>
Signature · 4 lines
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 coreThis 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(-)
drivers/char/mem.c +0 -1
@@ -26,7 +26,6 @@#include <asm/uaccess.h> #include <asm/io.h> -#include <asm/pgalloc.h> #ifdef CONFIG_IA64 # include <linux/efi.h>
drivers/net/82596.c +0 -1
@@ -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" ;
drivers/net/lasi_82596.c +0 -1
@@ -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>
drivers/net/macsonic.c +0 -1
@@ -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;
drivers/net/sun3lance.c +0 -1
@@ -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>
drivers/parisc/ccio-dma.c +0 -1
@@ -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>
drivers/parisc/ccio-rm-dma.c +0 -1
@@ -40,7 +40,6 @@#include <linux/pci.h> #include <asm/uaccess.h> -#include <asm/pgalloc.h> #include <asm/io.h> #include <asm/hardware.h>
drivers/video/console/sticore.c +0 -1
@@ -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>
sound/oss/dmasound/dmasound_atari.c +0 -1
@@ -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>
Signature · 4 lines
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 coreThis 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(-)
arch/i386/kernel/acpi/boot.c +1 -1
@@ -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>
arch/i386/kernel/apic.c +0 -1
@@ -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>
arch/i386/kernel/efi.c +0 -1
@@ -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
arch/i386/kernel/i386_ksyms.c +0 -1
@@ -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>
arch/i386/kernel/irq.c +0 -1
@@ -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>
arch/i386/kernel/mpparse.c +0 -1
@@ -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>
arch/i386/kernel/smp.c +0 -1
@@ -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>
arch/i386/kernel/smpboot.c +0 -1
@@ -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>
arch/i386/kernel/traps.c +0 -1
@@ -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>
arch/i386/kernel/vm86.c +0 -1
@@ -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>
arch/i386/mach-visws/traps.c +0 -1
@@ -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"
arch/i386/mach-voyager/voyager_basic.c +0 -1
@@ -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>
arch/i386/mach-voyager/voyager_smp.c +0 -1
@@ -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>
arch/i386/mach-voyager/voyager_thread.c +0 -1
@@ -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>
arch/i386/mm/fault.c +0 -1
@@ -24,7 +24,6 @@#include <asm/system.h> #include <asm/uaccess.h> -#include <asm/pgalloc.h> #include <asm/hardirq.h> #include <asm/desc.h>
arch/i386/mm/hugetlbpage.c +0 -1
@@ -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>
arch/i386/mm/init.c +0 -1
@@ -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>
arch/i386/mm/ioremap.c +0 -1
@@ -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>
Signature · 4 lines
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 coreRe: [PATCH] Clean up asm/pgalloc.h include (mips)
In reply to Russell KingThis 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 =====
arch/mips/baget/baget.c +0 -1
@@ -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 =====
arch/mips/kernel/irixelf.c +0 -1
@@ -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 =====
arch/mips/kernel/signal32.c +0 -1
@@ -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 =====
arch/mips/kernel/signal_n32.c +0 -1
@@ -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 =====
arch/mips/kernel/sysirix.c +0 -1
@@ -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 =====
arch/mips/mm/fault.c +0 -1
@@ -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 =====
arch/mips/mm/init.c +0 -1
@@ -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 =====
arch/mips/mm/ioremap.c +0 -1
@@ -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 =====
arch/mips/mm/pgtable-64.c +0 -1
@@ -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 =====
arch/mips/sgi-ip27/ip27-init.c +0 -1
@@ -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 =====
arch/mips/sgi-ip27/ip27-memory.c +0 -1
@@ -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>
[parisc-linux] Re: [PATCH] Clean up asm/pgalloc.h include (parisc)
In reply to Russell KingThis 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 =====
arch/parisc/hpux/sys_hpux.c +0 -1
@@ -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 =====
arch/parisc/kernel/cache.c +0 -1
@@ -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 =====
arch/parisc/kernel/init_task.c +0 -1
@@ -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 =====
arch/parisc/kernel/pci-dma.c +0 -1
@@ -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 =====
arch/parisc/kernel/signal.c +0 -1
@@ -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 =====
arch/parisc/kernel/smp.c +1 -1
@@ -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 =====
arch/parisc/mm/ioremap.c +0 -1
@@ -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 =====
arch/parisc/mm/kmap.c +0 -1
@@ -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 (parisc)
In reply to Russell KingThis 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 =====
arch/parisc/hpux/sys_hpux.c +0 -1
@@ -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 =====
arch/parisc/kernel/cache.c +0 -1
@@ -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 =====
arch/parisc/kernel/init_task.c +0 -1
@@ -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 =====
arch/parisc/kernel/pci-dma.c +0 -1
@@ -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 =====
arch/parisc/kernel/signal.c +0 -1
@@ -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 =====
arch/parisc/kernel/smp.c +1 -1
@@ -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 =====
arch/parisc/mm/ioremap.c +0 -1
@@ -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 =====
arch/parisc/mm/kmap.c +0 -1
@@ -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 (sparc)
In reply to Russell KingThis 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)
In reply to Russell KingThis 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 (alpha)
In reply to Russell KingThis 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 =====
kernel/alpha_ksyms.c renamed from arch/alpha/kernel/alpha_ksyms.c +0 -1
@@ -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 =====
kernel/core_irongate.c renamed from arch/alpha/kernel/core_irongate.c +0 -1
@@ -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 =====
kernel/core_marvel.c renamed from arch/alpha/kernel/core_marvel.c +0 -1
@@ -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 =====
kernel/core_titan.c renamed from arch/alpha/kernel/core_titan.c +0 -1
@@ -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 =====
kernel/machvec_impl.h renamed from arch/alpha/kernel/machvec_impl.h +0 -1
@@ -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 =====
kernel/smp.c renamed from arch/alpha/kernel/smp.c +0 -1
@@ -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 =====
mm/numa.c renamed from arch/alpha/mm/numa.c +0 -1
@@ -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 =====
mm/remap.c renamed from arch/alpha/mm/remap.c +0 -1
@@ -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)
In reply to Russell KingThis 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 =====
kernel/armksyms.c renamed from arch/arm26/kernel/armksyms.c +0 -1
@@ -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 =====
kernel/ecard.c renamed from arch/arm26/kernel/ecard.c +0 -1
@@ -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 =====
kernel/fiq.c renamed from arch/arm26/kernel/fiq.c +0 -1
@@ -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 =====
kernel/signal.c renamed from arch/arm26/kernel/signal.c +0 -1
@@ -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 =====
kernel/traps.c renamed from arch/arm26/kernel/traps.c +0 -1
@@ -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 =====
mm/init.c renamed from arch/arm26/mm/init.c +0 -1
@@ -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)
In reply to Russell KingThis 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 =====
arch/cris/mm/ioremap.c +0 -1
@@ -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)
In reply to 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 =====
arch/h8300/kernel/h8300_ksyms.c +0 -1
@@ -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 =====
arch/h8300/mm/kmap.c +0 -1
@@ -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)
In reply to Russell KingThis 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 =====
arch/ia64/kernel/irq.c +0 -1
@@ -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 =====
arch/ia64/kernel/smp.c +0 -1
@@ -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 =====
arch/ia64/kernel/smpboot.c +0 -1
@@ -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 =====
arch/ia64/mm/contig.c +0 -1
@@ -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 =====
arch/ia64/mm/discontig.c +0 -1
@@ -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 =====
arch/ia64/mm/hugetlbpage.c +0 -1
@@ -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 =====
arch/ia64/mm/tlb.c +0 -1
@@ -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 =====
arch/ia64/sn/kernel/sn2/cache.c +1 -1
@@ -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)
In reply to Russell KingThis 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 =====
arch/m68k/kernel/m68k_ksyms.c +0 -1
@@ -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 =====
arch/m68k/kernel/traps.c +0 -1
@@ -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 =====
arch/m68k/mm/fault.c +0 -1
@@ -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 =====
arch/m68k/mm/init.c +0 -1
@@ -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 =====
arch/m68k/mm/kmap.c +0 -1
@@ -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 =====
arch/m68k/mm/memory.c +0 -1
@@ -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 =====
arch/m68k/mm/motorola.c +0 -1
@@ -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 =====
arch/m68k/sun3x/dvma.c +0 -1
@@ -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)
In reply to 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 =====
arch/m68knommu/kernel/m68k_ksyms.c +0 -1
@@ -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 =====
arch/m68knommu/mm/kmap.c +0 -1
@@ -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 (ppc64)
In reply to Russell KingThis 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 =====
arch/ppc64/mm/hugetlbpage.c +0 -1
@@ -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 =====
arch/ppc64/mm/imalloc.c +0 -1
@@ -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 =====
arch/ppc64/mm/init.c +0 -1
@@ -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)
In reply to Russell KingThis 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 =====
arch/s390/kernel/compat_exec.c +0 -1
@@ -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 =====
arch/s390/kernel/ptrace.c +0 -1
@@ -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 =====
arch/s390/kernel/s390_ksyms.c +0 -1
@@ -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 =====
arch/s390/kernel/smp.c +0 -1
@@ -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 =====
arch/s390/mm/cmm.c +0 -1
@@ -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 =====
arch/s390/mm/ioremap.c +0 -1
@@ -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)
In reply to 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 =====
arch/sh/kernel/irq.c +0 -1
@@ -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 =====
arch/sh/mm/cache-sh3.c +0 -1
@@ -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 =====
arch/sh/mm/cache-sh4.c +0 -1
@@ -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 =====
arch/sh/mm/fault-nommu.c +0 -1
@@ -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 =====
arch/sh/mm/fault.c +0 -1
@@ -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 =====
arch/sh/mm/hugetlbpage.c +0 -1
@@ -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 =====
arch/sh/mm/init.c +0 -1
@@ -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 =====
arch/sh/mm/ioremap.c +0 -1
@@ -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 =====
arch/sh/mm/pg-sh4.c +0 -1
@@ -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 =====
arch/sh/mm/tlb-sh3.c +0 -1
@@ -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 =====
arch/sh/mm/tlb-sh4.c +0 -1
@@ -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 (ppc)
In reply to Russell KingThis 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 =====
arch/ppc/mm/44x_mmu.c +0 -1
@@ -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 =====
arch/ppc/mm/4xx_mmu.c +0 -1
@@ -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 =====
arch/ppc/mm/cachemap.c +0 -1
@@ -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 =====
arch/ppc/mm/init.c +0 -1
@@ -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 (v850)
In reply to Russell KingThis 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 =====
arch/v850/kernel/signal.c +0 -1
@@ -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 =====
arch/v850/kernel/v850_ksyms.c +0 -1
@@ -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)
In reply to Russell KingThis 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 =====
arch/x86_64/ia32/ia32_aout.c +0 -1
@@ -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 =====
arch/x86_64/kernel/acpi/sleep.c +0 -1
@@ -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 =====
arch/x86_64/kernel/apic.c +0 -1
@@ -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 =====
arch/x86_64/kernel/irq.c +0 -1
@@ -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 =====
arch/x86_64/kernel/mpparse.c +0 -1
@@ -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 =====
arch/x86_64/kernel/smp.c +0 -1
@@ -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 =====
arch/x86_64/kernel/smpboot.c +0 -1
@@ -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 =====
arch/x86_64/kernel/traps.c +0 -1
@@ -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 =====
arch/x86_64/kernel/x8664_ksyms.c +0 -1
@@ -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 =====
arch/x86_64/mm/fault.c +0 -1
@@ -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 =====
arch/x86_64/mm/init.c +0 -1
@@ -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 =====
arch/x86_64/mm/ioremap.c +0 -1
@@ -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)
Quoted 10 lines · On Mon, 19 Apr 2004 14:23:16 +0100 Russell King <[email protected]>…
This patch cleans up needless includes of
asm/pgalloc.hfrom thearch/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
Geert Uytterhoeven
maintainerRe: [PATCH] Clean up asm/pgalloc.h include (m68k)
In reply to Russell KingQuoted 11 lines · Russell King
This patch cleans up needless includes of
asm/pgalloc.hfrom thearch/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
Quoted 8 lines
This patch is part of a larger patch aiming towards getting the include of
asm/pgtable.hout oflinux/mm.h, so thatasm/pgtable.hcan sanely get at things likemm_structand 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 eitherasm/pgtable.h(unlikely),asm/cacheflush.horasm/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()?
arch/m68k/kernel/m68k_ksyms.c +1 -0
@@ -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 );
arch/m68k/kernel/traps.c +1 -0
@@ -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);
arch/m68k/mm/kmap.c +1 -0
@@ -20,6 +20,7 @@#include <asm/page.h> #include <asm/io.h> #include <asm/system.h> +#include <asm/tlbflush.h> #undef DEBUG
arch/m68k/mm/memory.c +1 -0
@@ -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
arch/m68k/mm/motorola.c +2 -0
@@ -30,6 +30,8 @@#ifdef CONFIG_ATARI #include <asm/atari_stram.h> #endif +#include <asm/tlbflush.h> +#include <asm/cacheflush.h> #undef DEBUG
arch/m68k/sun3x/dvma.c +1 -0
@@ -23,6 +23,7 @@#include <asm/io.h> #include <asm/page.h> #include <asm/pgtable.h> +#include <asm/tlbflush.h> /* IOMMU support */
include/asm-m68k/motorola_pgalloc.h +1 -0
@@ -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 -- [email protected]
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)
Quoted 6 lines · Geert Uytterhoeven
The patch below fixes all compile-issues on m68k, except when compiling for Sun-3.
include/asm-generic/tlb.hnow includes <asm/pgalloc.h>, which includes <asm/sun3_pgalloc.h>. But the last file needstlb_remove_page(), which is defined ininclude/asm-generic/tlb.h
Nice.
Quoted 1 line
Do you really need <
asm/pgalloc.h> ininclude/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.
Signature · 4 lines
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 coreRe: [PATCH] Clean up asm/pgalloc.h include (mips)
In reply to Russell KingQuoted 11 lines · Russell King
This patch cleans up needless includes of
asm/pgalloc.hfrom thearch/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
Quoted 8 lines
This patch is part of a larger patch aiming towards getting the include of
asm/pgtable.hout oflinux/mm.h, so thatasm/pgtable.hcan sanely get at things likemm_structand 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 eitherasm/pgtable.h(unlikely),asm/cacheflush.horasm/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
mips/baget/baget.c +0 -1
@@ -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
mips/kernel/irixelf.c +0 -1
@@ -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
mips/kernel/signal32.c +0 -1
@@ -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
mips/kernel/signal_n32.c +0 -1
@@ -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
mips/kernel/sysirix.c +0 -1
@@ -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
mips/mm/fault.c +0 -1
@@ -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
mips/mm/init.c +2 -1
@@ -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
mips/mm/ioremap.c +0 -1
@@ -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
mips/mm/pgtable-64.c +0 -1
@@ -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
mips/sgi-ip27/ip27-init.c +0 -1
@@ -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
asm-mips/pgalloc.h +0 -6
@@ -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
asm-mips/pgtable-64.h +6 -0
@@ -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)
In reply to Geert Uytterhoevenarch/m68k/kernel/m68k_ksyms.c
Quoted 4 lines · Geert Uytterhoeven
arch/m68k/kernel/m68k_ksyms.c +0
-0@@ -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.
Signature · 4 lines
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 coreGeert Uytterhoeven
maintainerRe: [PATCH] Clean up asm/pgalloc.h include (m68k)
In reply to Russell KingQuoted 12 lines · Russell King
Quoted 1 line · Geert Uytterhoeven
Do you really need <
asm/pgalloc.h> ininclude/asm-generic/tlb.h?Yes it does -
tlb.husescheck_pgt_cache(). Also, architecture code makes use of__pmd_free_tlband__pte_free_tlb, both of which make use of code fromasm/pgalloc.h.Not including
asm/pgalloc.hintoasm/tlb.horasm-generic/tlb.hmeans that all the generic files have to know thatasm/tlb.hneedsasm/pgalloc.h, and they also then need to know thatasm/pgalloc.hneedsasm/pgtable.h, andasm/pgtable.hneeds ...
Quoted 8 lines
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?)
Quoted 3 lines
#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:
include/asm-m68k/sun3_pgalloc.h +1 -4
@@ -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 -- [email protected]
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)
In reply to Russell KingQuoted 4 lines · Russell King
This patch cleans up needless includes of
asm/pgalloc.hfrom thearch/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)
In reply to Russell KingQuoted 11 lines · Russell King
This patch cleans up needless includes of
asm/pgalloc.hfrom thearch/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
Quoted 8 lines
This patch is part of a larger patch aiming towards getting the include of
asm/pgtable.hout oflinux/mm.h, so thatasm/pgtable.hcan sanely get at things likemm_structand 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 eitherasm/pgtable.h(unlikely),asm/cacheflush.horasm/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 =====
arch/ia64/mm/discontig.c +0 -2
@@ -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 =====
arch/ia64/mm/contig.c +0 -2
@@ -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 =====
include/asm-ia64/tlb.h +2 -1
@@ -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)
In reply to Russell KingQuoted 9 lines · Russell King
This patch is part of a larger patch aiming towards getting the include of
asm/pgtable.hout oflinux/mm.h, so thatasm/pgtable.hcan sanely get at things likemm_structand 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 eitherasm/pgtable.h(unlikely),asm/cacheflush.horasm/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.
arch/sh/mm/tlb-sh4.c +21 -1
@@ -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; +} +
include/asm-sh/pgtable.h +4 -15
@@ -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 */
include/asm-sh/pgalloc.h +4 -63
75 lines not on this page · raw message
Re: [PATCH] Clean up asm/pgalloc.h include (sh)
Quoted 2 lines · Paul Mundt
Failed to compile. sh has
ptep_get_and_clearinasm/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 [email protected] 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)
Quoted 8 lines · Hugh Dickins
Quoted 2 lines · Paul Mundt
Failed to compile. sh has
ptep_get_and_clearinasm/pgalloc.h. This moves it out of the way, and your patch builds fine.Paul, the patch you show reflects how
ptep_get_and_clearlooked in 2.6.5, but not how it now looks in 2.6.6-rc1-bk - should be usingpage_mapping(page)andmapping_writably_mapped(mapping).
Quoted 6 lines
I dare say you're referring to a master tree into which the recent mainline changes need to be ported (I CC'ed [email protected] 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 =====
arch/sh/mm/tlb-sh4.c +20 -1
@@ -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 =====
include/asm-sh/pgalloc.h +1 -61
70 lines not on this page · raw message
===== include/asm-sh/pgtable.h 1.22 vs edited =====
include/asm-sh/pgtable.h +4 -15
@@ -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 */
Re: [PATCH] Clean up asm/pgalloc.h include (ppc)
In reply to Russell KingQuoted 11 lines · Russell King
This patch cleans up needless includes of
asm/pgalloc.hfrom thearch/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
Quoted 8 lines
This patch is part of a larger patch aiming towards getting the include of
asm/pgtable.hout oflinux/mm.h, so thatasm/pgtable.hcan sanely get at things likemm_structand 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 eitherasm/pgtable.h(unlikely),asm/cacheflush.horasm/tlbflush.h.
Better late than never I hope, this is fine on ppc32.
Signature · 2 lines
Tom Rini http://gate.crashing.org/~trini/