From 7521662669deab2c98370ac121f3500812e3b98b Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 7 Aug 2008 09:55:16 +0100 Subject: [PATCH] --- yaml --- r: 108059 b: refs/heads/master c: a1b81a84fff05dbfef45b7012c26e1fee9973e5d h: refs/heads/master i: 108057: 5569d80393a857567625cd31b5897d2c43e478e0 108055: 92ca92e6325cfb8b8fc4ab0250017672ed87fe52 v: v3 --- [refs] | 2 +- trunk/Documentation/00-INDEX | 2 - trunk/Documentation/DocBook/Makefile | 2 +- trunk/Documentation/DocBook/s390-drivers.tmpl | 8 +- trunk/Documentation/DocBook/sh.tmpl | 105 ++ trunk/Documentation/cli-sti-removal.txt | 133 --- .../Documentation/power/pm_qos_interface.txt | 7 +- .../powerpc/booting-without-of.txt | 4 +- .../powerpc/eeh-pci-error-recovery.txt | 2 +- trunk/MAINTAINERS | 6 + trunk/Makefile | 10 +- trunk/arch/arm/Makefile | 35 +- trunk/arch/arm/boot/compressed/Makefile | 3 - trunk/arch/arm/boot/compressed/head-xscale.S | 1 - trunk/arch/arm/common/locomo.c | 2 +- trunk/arch/arm/common/sa1111.c | 2 +- trunk/arch/arm/common/sharpsl_pm.c | 3 +- trunk/arch/arm/common/time-acorn.c | 2 +- trunk/arch/arm/common/uengine.c | 1 - .../asm-arm => arch/arm/include/asm}/Kbuild | 0 .../arm/include/asm}/a.out-core.h | 0 .../asm-arm => arch/arm/include/asm}/a.out.h | 0 .../arm/include/asm}/assembler.h | 2 +- .../asm-arm => arch/arm/include/asm}/atomic.h | 2 +- .../asm-arm => arch/arm/include/asm}/auxvec.h | 0 .../asm-arm => arch/arm/include/asm}/bitops.h | 0 .../asm-arm => arch/arm/include/asm}/bug.h | 0 .../asm-arm => arch/arm/include/asm}/bugs.h | 2 +- .../arm/include/asm}/byteorder.h | 2 +- .../asm-arm => arch/arm/include/asm}/cache.h | 2 +- .../arm/include/asm}/cacheflush.h | 2 +- .../arm/include/asm}/checksum.h | 2 +- .../arm/include/asm}/cnt32_to_63.h | 0 .../arm/include/asm}/cpu-multi32.h | 2 +- .../arm/include/asm}/cpu-single.h | 2 +- .../asm-arm => arch/arm/include/asm}/cpu.h | 2 +- .../arm/include/asm}/cputime.h | 0 .../arm/include/asm}/current.h | 0 .../asm-arm => arch/arm/include/asm}/delay.h | 0 .../asm-arm => arch/arm/include/asm}/device.h | 0 .../asm-arm => arch/arm/include/asm}/div64.h | 0 .../arm/include/asm}/dma-mapping.h | 0 .../asm-arm => arch/arm/include/asm}/dma.h | 0 .../asm-arm => arch/arm/include/asm}/domain.h | 2 +- .../asm-arm => arch/arm/include/asm}/ecard.h | 2 +- .../asm-arm => arch/arm/include/asm}/elf.h | 0 .../arm/include/asm}/emergency-restart.h | 0 .../asm-arm => arch/arm/include/asm}/errno.h | 0 .../asm-arm => arch/arm/include/asm}/fb.h | 0 .../asm-arm => arch/arm/include/asm}/fcntl.h | 0 .../asm-arm => arch/arm/include/asm}/fiq.h | 2 +- .../asm-arm => arch/arm/include/asm}/flat.h | 2 +- .../asm-arm => arch/arm/include/asm}/floppy.h | 2 +- .../arm/include/asm}/fpstate.h | 2 +- .../asm-arm => arch/arm/include/asm}/ftrace.h | 0 .../asm-arm => arch/arm/include/asm}/futex.h | 0 .../asm-arm => arch/arm/include/asm}/glue.h | 2 +- .../asm-arm => arch/arm/include/asm}/gpio.h | 0 .../arm/include/asm}/hardirq.h | 0 .../arm/include/asm}/hardware/arm_timer.h | 0 .../arm/include/asm}/hardware/arm_twd.h | 0 .../arm/include/asm}/hardware/cache-l2x0.h | 2 +- .../arm/include/asm}/hardware/clps7111.h | 2 +- .../arm/include/asm}/hardware/cs89712.h | 2 +- .../arm/include/asm}/hardware/debug-8250.S | 2 +- .../arm/include/asm}/hardware/debug-pl01x.S | 2 +- .../arm/include/asm}/hardware/dec21285.h | 4 +- .../include/asm}/hardware/entry-macro-iomd.S | 2 +- .../arm/include/asm}/hardware/ep7211.h | 2 +- .../arm/include/asm}/hardware/ep7212.h | 2 +- .../arm/include/asm}/hardware/gic.h | 2 +- .../arm/include/asm}/hardware/icst307.h | 2 +- .../arm/include/asm}/hardware/icst525.h | 2 +- .../arm/include/asm}/hardware/ioc.h | 2 +- .../arm/include/asm}/hardware/iomd.h | 2 +- .../arm/include/asm}/hardware/iop3xx-adma.h | 2 +- .../arm/include/asm}/hardware/iop3xx-gpio.h | 4 +- .../arm/include/asm}/hardware/iop3xx.h | 2 +- .../arm/include/asm}/hardware/iop_adma.h | 0 .../arm/include/asm}/hardware/it8152.h | 0 .../arm/include/asm}/hardware/linkup-l1110.h | 0 .../arm/include/asm}/hardware/locomo.h | 2 +- .../arm/include/asm}/hardware/memc.h | 2 +- .../arm/include/asm}/hardware/pci_v3.h | 2 +- .../arm/include/asm}/hardware/sa1111.h | 2 +- .../arm/include/asm}/hardware/scoop.h | 0 .../arm/include/asm}/hardware/sharpsl_pm.h | 0 .../arm/include/asm}/hardware/ssp.h | 0 .../arm/include/asm}/hardware/uengine.h | 0 .../arm/include/asm}/hardware/vic.h | 2 +- trunk/arch/arm/include/asm/hw_irq.h | 27 + .../asm-arm => arch/arm/include/asm}/hwcap.h | 0 .../asm-arm => arch/arm/include/asm}/ide.h | 2 +- .../asm-arm => arch/arm/include/asm}/io.h | 2 +- .../asm-arm => arch/arm/include/asm}/ioctl.h | 0 .../asm-arm => arch/arm/include/asm}/ioctls.h | 0 .../asm-arm => arch/arm/include/asm}/ipcbuf.h | 0 .../asm-arm => arch/arm/include/asm}/irq.h | 0 .../arm/include/asm}/irq_regs.h | 0 .../arm/include/asm}/irqflags.h | 0 .../asm-arm => arch/arm/include/asm}/kdebug.h | 0 .../asm-arm => arch/arm/include/asm}/kexec.h | 0 .../asm-arm => arch/arm/include/asm}/kgdb.h | 0 .../arm/include/asm}/kmap_types.h | 0 .../arm/include/asm}/kprobes.h | 2 +- .../asm-arm => arch/arm/include/asm}/leds.h | 2 +- .../asm-arm => arch/arm/include/asm}/limits.h | 0 .../arm/include/asm}/linkage.h | 0 .../asm-arm => arch/arm/include/asm}/local.h | 0 .../asm-arm => arch/arm/include/asm}/locks.h | 2 +- .../arm/include/asm}/mach/arch.h | 2 +- .../arm/include/asm}/mach/dma.h | 2 +- .../arm/include/asm}/mach/flash.h | 2 +- .../arm/include/asm}/mach/irda.h | 2 +- .../arm/include/asm}/mach/irq.h | 22 +- .../arm/include/asm}/mach/map.h | 2 +- .../arm/include/asm}/mach/mmc.h | 2 +- .../arm/include/asm}/mach/pci.h | 2 +- .../arm/include/asm}/mach/serial_at91.h | 2 +- .../arm/include/asm}/mach/serial_sa1100.h | 4 +- .../arm/include/asm}/mach/sharpsl_param.h | 0 .../arm/include/asm}/mach/time.h | 2 +- .../arm/include/asm}/mach/udc_pxa2xx.h | 2 +- .../arm/include/asm}/mc146818rtc.h | 0 .../asm-arm => arch/arm/include/asm}/memory.h | 2 +- .../asm-arm => arch/arm/include/asm}/mman.h | 0 .../asm-arm => arch/arm/include/asm}/mmu.h | 0 .../arm/include/asm}/mmu_context.h | 2 +- .../asm-arm => arch/arm/include/asm}/mmzone.h | 2 +- .../asm-arm => arch/arm/include/asm}/module.h | 0 .../asm-arm => arch/arm/include/asm}/msgbuf.h | 0 .../arm/include/asm}/mtd-xip.h | 2 +- .../asm-arm => arch/arm/include/asm}/mutex.h | 2 +- .../arm/include/asm}/nwflash.h | 0 .../arm/include/asm}/page-nommu.h | 2 +- .../asm-arm => arch/arm/include/asm}/page.h | 2 +- .../asm-arm => arch/arm/include/asm}/param.h | 2 +- .../arm/include/asm}/parport.h | 2 +- .../asm-arm => arch/arm/include/asm}/pci.h | 2 +- .../asm-arm => arch/arm/include/asm}/percpu.h | 0 .../arm/include/asm}/pgalloc.h | 2 +- .../arm/include/asm}/pgtable-hwdef.h | 2 +- .../arm/include/asm}/pgtable-nommu.h | 2 +- .../arm/include/asm}/pgtable.h | 2 +- .../asm-arm => arch/arm/include/asm}/poll.h | 0 .../arm/include/asm}/posix_types.h | 2 +- .../arm/include/asm}/proc-fns.h | 2 +- .../arm/include/asm}/processor.h | 2 +- .../arm/include/asm}/procinfo.h | 2 +- .../asm-arm => arch/arm/include/asm}/ptrace.h | 2 +- .../arm/include/asm}/resource.h | 0 .../arm/include/asm}/scatterlist.h | 0 .../arm/include/asm}/sections.h | 0 .../arm/include/asm}/segment.h | 0 .../asm-arm => arch/arm/include/asm}/sembuf.h | 0 .../asm-arm => arch/arm/include/asm}/serial.h | 2 +- .../asm-arm => arch/arm/include/asm}/setup.h | 0 .../asm-arm => arch/arm/include/asm}/shmbuf.h | 0 .../arm/include/asm}/shmparam.h | 0 .../arm/include/asm}/sigcontext.h | 0 .../arm/include/asm}/siginfo.h | 0 .../asm-arm => arch/arm/include/asm}/signal.h | 0 .../asm-arm => arch/arm/include/asm}/sizes.h | 0 .../asm-arm => arch/arm/include/asm}/smp.h | 4 +- .../asm-arm => arch/arm/include/asm}/socket.h | 0 .../arm/include/asm}/sockios.h | 0 .../arm/include/asm}/sparsemem.h | 0 .../arm/include/asm}/spinlock.h | 0 .../arm/include/asm}/spinlock_types.h | 0 .../asm-arm => arch/arm/include/asm}/stat.h | 0 .../asm-arm => arch/arm/include/asm}/statfs.h | 0 .../asm-arm => arch/arm/include/asm}/string.h | 0 .../arm/include/asm}/suspend.h | 0 .../asm-arm => arch/arm/include/asm}/system.h | 0 .../arm/include/asm}/termbits.h | 0 .../arm/include/asm}/termios.h | 0 .../asm-arm => arch/arm/include/asm}/therm.h | 2 +- .../arm/include/asm}/thread_info.h | 4 +- .../arm/include/asm}/thread_notify.h | 2 +- .../asm-arm => arch/arm/include/asm}/timex.h | 2 +- .../asm-arm => arch/arm/include/asm}/tlb.h | 2 +- .../arm/include/asm}/tlbflush.h | 2 +- .../arm/include/asm}/topology.h | 0 .../asm-arm => arch/arm/include/asm}/traps.h | 0 .../asm-arm => arch/arm/include/asm}/types.h | 0 .../arm/include/asm}/uaccess.h | 2 +- .../arm/include/asm}/ucontext.h | 0 .../arm/include/asm}/unaligned.h | 0 .../asm-arm => arch/arm/include/asm}/unistd.h | 2 +- .../asm-arm => arch/arm/include/asm}/user.h | 0 .../asm-arm => arch/arm/include/asm}/vfp.h | 2 +- .../arm/include/asm}/vfpmacros.h | 2 +- .../asm-arm => arch/arm/include/asm}/vga.h | 2 +- .../asm-arm => arch/arm/include/asm}/xor.h | 2 +- trunk/arch/arm/kernel/ecard.c | 2 +- trunk/arch/arm/kernel/head-common.S | 2 +- trunk/arch/arm/kernel/head-nommu.S | 1 - trunk/arch/arm/kernel/irq.c | 1 + trunk/arch/arm/lib/ecard.S | 2 +- trunk/arch/arm/lib/getuser.S | 2 +- trunk/arch/arm/lib/io-readsw-armv3.S | 2 +- trunk/arch/arm/lib/io-writesw-armv3.S | 2 +- trunk/arch/arm/lib/putuser.S | 2 +- trunk/arch/arm/mach-aaec2000/aaed2000.c | 2 +- trunk/arch/arm/mach-aaec2000/core.c | 2 +- trunk/arch/arm/mach-at91/at91x40_time.c | 2 +- trunk/arch/arm/mach-at91/board-1arm.c | 2 +- trunk/arch/arm/mach-at91/board-cam60.c | 2 +- trunk/arch/arm/mach-at91/board-cap9adk.c | 2 +- trunk/arch/arm/mach-at91/board-carmeva.c | 2 +- trunk/arch/arm/mach-at91/board-csb337.c | 2 +- trunk/arch/arm/mach-at91/board-csb637.c | 2 +- trunk/arch/arm/mach-at91/board-dk.c | 2 +- trunk/arch/arm/mach-at91/board-eb01.c | 2 +- trunk/arch/arm/mach-at91/board-eb9200.c | 2 +- trunk/arch/arm/mach-at91/board-ecbat91.c | 2 +- trunk/arch/arm/mach-at91/board-ek.c | 2 +- trunk/arch/arm/mach-at91/board-kafa.c | 2 +- trunk/arch/arm/mach-at91/board-kb9202.c | 2 +- trunk/arch/arm/mach-at91/board-picotux200.c | 2 +- trunk/arch/arm/mach-at91/board-qil-a9260.c | 2 +- trunk/arch/arm/mach-at91/board-sam9-l9260.c | 2 +- trunk/arch/arm/mach-at91/board-sam9260ek.c | 2 +- trunk/arch/arm/mach-at91/board-sam9261ek.c | 2 +- trunk/arch/arm/mach-at91/board-sam9263ek.c | 2 +- trunk/arch/arm/mach-at91/board-sam9g20ek.c | 2 +- trunk/arch/arm/mach-at91/board-sam9rlek.c | 2 +- trunk/arch/arm/mach-at91/board-usb-a9260.c | 2 +- trunk/arch/arm/mach-at91/board-usb-a9263.c | 2 +- trunk/arch/arm/mach-at91/board-yl-9200.c | 2 +- trunk/arch/arm/mach-at91/clock.c | 3 +- trunk/arch/arm/mach-at91/gpio.c | 2 +- trunk/arch/arm/mach-at91/irq.c | 3 +- trunk/arch/arm/mach-at91/leds.c | 1 - trunk/arch/arm/mach-at91/pm.c | 1 - trunk/arch/arm/mach-clps711x/autcpu12.c | 2 +- trunk/arch/arm/mach-clps711x/cdb89712.c | 2 +- trunk/arch/arm/mach-clps711x/ceiva.c | 2 +- trunk/arch/arm/mach-clps711x/edb7211-mm.c | 2 +- trunk/arch/arm/mach-clps711x/fortunet.c | 2 +- trunk/arch/arm/mach-clps711x/irq.c | 2 +- trunk/arch/arm/mach-clps711x/mm.c | 2 +- trunk/arch/arm/mach-clps711x/p720t-leds.c | 2 +- trunk/arch/arm/mach-clps711x/p720t.c | 2 +- trunk/arch/arm/mach-clps711x/time.c | 2 +- trunk/arch/arm/mach-clps7500/core.c | 2 +- trunk/arch/arm/mach-davinci/board-evm.c | 2 +- trunk/arch/arm/mach-davinci/clock.c | 2 +- trunk/arch/arm/mach-davinci/irq.c | 2 +- trunk/arch/arm/mach-davinci/mux.c | 2 +- trunk/arch/arm/mach-davinci/psc.c | 2 +- trunk/arch/arm/mach-davinci/serial.c | 2 +- trunk/arch/arm/mach-davinci/time.c | 2 +- trunk/arch/arm/mach-ebsa110/core.c | 2 +- trunk/arch/arm/mach-ebsa110/io.c | 2 +- trunk/arch/arm/mach-ebsa110/leds.c | 2 +- trunk/arch/arm/mach-ep93xx/adssphere.c | 2 +- trunk/arch/arm/mach-ep93xx/clock.c | 2 +- trunk/arch/arm/mach-ep93xx/core.c | 2 +- trunk/arch/arm/mach-ep93xx/edb9302.c | 2 +- trunk/arch/arm/mach-ep93xx/edb9302a.c | 2 +- trunk/arch/arm/mach-ep93xx/edb9307.c | 2 +- trunk/arch/arm/mach-ep93xx/edb9312.c | 2 +- trunk/arch/arm/mach-ep93xx/edb9315.c | 2 +- trunk/arch/arm/mach-ep93xx/edb9315a.c | 2 +- trunk/arch/arm/mach-ep93xx/gesbc9312.c | 2 +- trunk/arch/arm/mach-ep93xx/micro9.c | 2 +- trunk/arch/arm/mach-ep93xx/ts72xx.c | 2 +- trunk/arch/arm/mach-footbridge/ebsa285-leds.c | 2 +- trunk/arch/arm/mach-footbridge/isa-irq.c | 2 +- .../arch/arm/mach-footbridge/netwinder-leds.c | 2 +- trunk/arch/arm/mach-footbridge/time.c | 2 +- trunk/arch/arm/mach-h720x/common.c | 2 +- trunk/arch/arm/mach-h720x/cpu-h7201.c | 2 +- trunk/arch/arm/mach-h720x/cpu-h7202.c | 2 +- trunk/arch/arm/mach-h720x/h7201-eval.c | 2 +- trunk/arch/arm/mach-h720x/h7202-eval.c | 2 +- trunk/arch/arm/mach-imx/clock.c | 5 + trunk/arch/arm/mach-imx/cpufreq.c | 2 +- trunk/arch/arm/mach-imx/dma.c | 2 +- trunk/arch/arm/mach-imx/generic.c | 3 +- trunk/arch/arm/mach-imx/irq.c | 2 +- trunk/arch/arm/mach-imx/leds-mx1ads.c | 2 +- trunk/arch/arm/mach-imx/mx1ads.c | 6 +- trunk/arch/arm/mach-imx/time.c | 2 +- trunk/arch/arm/mach-integrator/core.c | 2 +- trunk/arch/arm/mach-integrator/cpu.c | 2 +- .../arch/arm/mach-integrator/integrator_ap.c | 2 +- .../arch/arm/mach-integrator/integrator_cp.c | 2 +- trunk/arch/arm/mach-integrator/leds.c | 2 +- trunk/arch/arm/mach-integrator/pci_v3.c | 2 +- trunk/arch/arm/mach-iop13xx/io.c | 2 +- trunk/arch/arm/mach-iop13xx/iq81340mc.c | 2 +- trunk/arch/arm/mach-iop13xx/iq81340sc.c | 2 +- trunk/arch/arm/mach-iop13xx/irq.c | 3 +- trunk/arch/arm/mach-iop13xx/pci.c | 2 +- trunk/arch/arm/mach-iop13xx/setup.c | 2 +- trunk/arch/arm/mach-iop32x/em7210.c | 2 +- trunk/arch/arm/mach-iop32x/glantank.c | 2 +- trunk/arch/arm/mach-iop32x/iq31244.c | 2 +- trunk/arch/arm/mach-iop32x/iq80321.c | 2 +- trunk/arch/arm/mach-iop32x/irq.c | 2 +- trunk/arch/arm/mach-iop32x/n2100.c | 2 +- trunk/arch/arm/mach-iop33x/iq80331.c | 2 +- trunk/arch/arm/mach-iop33x/iq80332.c | 2 +- trunk/arch/arm/mach-iop33x/irq.c | 2 +- trunk/arch/arm/mach-iop33x/uart.c | 3 +- trunk/arch/arm/mach-ixp2000/core.c | 2 +- trunk/arch/arm/mach-ixp2000/enp2611.c | 2 +- trunk/arch/arm/mach-ixp2000/ixdp2400.c | 2 +- trunk/arch/arm/mach-ixp2000/ixdp2800.c | 2 +- trunk/arch/arm/mach-ixp2000/ixdp2x00.c | 2 +- trunk/arch/arm/mach-ixp2000/ixdp2x01.c | 2 +- trunk/arch/arm/mach-ixp2000/pci.c | 2 +- trunk/arch/arm/mach-ixp23xx/core.c | 3 +- trunk/arch/arm/mach-ixp23xx/espresso.c | 2 +- trunk/arch/arm/mach-ixp23xx/ixdp2351.c | 2 +- trunk/arch/arm/mach-ixp23xx/pci.c | 3 +- trunk/arch/arm/mach-ixp23xx/roadrunner.c | 2 +- trunk/arch/arm/mach-ixp4xx/avila-pci.c | 2 +- trunk/arch/arm/mach-ixp4xx/avila-setup.c | 2 +- trunk/arch/arm/mach-ixp4xx/common-pci.c | 2 +- trunk/arch/arm/mach-ixp4xx/common.c | 2 +- trunk/arch/arm/mach-ixp4xx/coyote-pci.c | 2 +- trunk/arch/arm/mach-ixp4xx/coyote-setup.c | 2 +- trunk/arch/arm/mach-ixp4xx/gateway7001-pci.c | 2 +- .../arch/arm/mach-ixp4xx/gateway7001-setup.c | 2 +- trunk/arch/arm/mach-ixp4xx/gtwx5715-pci.c | 2 +- trunk/arch/arm/mach-ixp4xx/gtwx5715-setup.c | 2 +- trunk/arch/arm/mach-ixp4xx/ixdp425-pci.c | 2 +- trunk/arch/arm/mach-ixp4xx/ixdp425-setup.c | 2 +- trunk/arch/arm/mach-ixp4xx/ixdpg425-pci.c | 2 +- trunk/arch/arm/mach-ixp4xx/wg302v2-pci.c | 2 +- trunk/arch/arm/mach-ixp4xx/wg302v2-setup.c | 2 +- trunk/arch/arm/mach-kirkwood/addr-map.c | 2 +- trunk/arch/arm/mach-ks8695/cpu.c | 2 +- trunk/arch/arm/mach-ks8695/gpio.c | 2 +- trunk/arch/arm/mach-ks8695/irq.c | 2 +- trunk/arch/arm/mach-ks8695/leds.c | 1 - trunk/arch/arm/mach-ks8695/pci.c | 2 +- trunk/arch/arm/mach-l7200/core.c | 2 +- trunk/arch/arm/mach-lh7a40x/arch-kev7a400.c | 2 +- trunk/arch/arm/mach-lh7a40x/arch-lpd7a40x.c | 2 +- trunk/arch/arm/mach-lh7a40x/clcd.c | 3 +- trunk/arch/arm/mach-lh7a40x/clocks.c | 2 +- trunk/arch/arm/mach-lh7a40x/irq-lh7a400.c | 2 +- trunk/arch/arm/mach-lh7a40x/irq-lh7a404.c | 2 +- trunk/arch/arm/mach-lh7a40x/irq-lpd7a40x.c | 2 +- trunk/arch/arm/mach-lh7a40x/ssp-cpld.c | 2 +- trunk/arch/arm/mach-lh7a40x/time.c | 2 +- trunk/arch/arm/mach-loki/addr-map.c | 2 +- trunk/arch/arm/mach-msm/board-halibut.c | 2 +- trunk/arch/arm/mach-msm/io.c | 2 +- trunk/arch/arm/mach-msm/irq.c | 2 +- trunk/arch/arm/mach-mx2/clock_imx27.c | 1 - trunk/arch/arm/mach-mx2/cpu_imx27.c | 2 +- trunk/arch/arm/mach-mx2/devices.c | 2 +- trunk/arch/arm/mach-mx2/generic.c | 2 +- trunk/arch/arm/mach-mx2/mx27ads.c | 2 +- trunk/arch/arm/mach-mx2/pcm038.c | 2 +- trunk/arch/arm/mach-mx2/pcm970-baseboard.c | 3 +- trunk/arch/arm/mach-mx2/serial.c | 2 +- trunk/arch/arm/mach-mx3/devices.c | 2 +- trunk/arch/arm/mach-mx3/iomux.c | 2 +- trunk/arch/arm/mach-mx3/mm.c | 2 +- trunk/arch/arm/mach-mx3/mx31ads.c | 2 +- trunk/arch/arm/mach-mx3/mx31lite.c | 2 +- trunk/arch/arm/mach-mx3/pcm037.c | 2 +- trunk/arch/arm/mach-netx/fb.c | 2 +- trunk/arch/arm/mach-netx/generic.c | 2 +- trunk/arch/arm/mach-netx/nxdb500.c | 2 +- trunk/arch/arm/mach-netx/nxdkn.c | 2 +- trunk/arch/arm/mach-netx/nxeb500hmi.c | 2 +- trunk/arch/arm/mach-netx/pfifo.c | 2 +- trunk/arch/arm/mach-netx/time.c | 2 +- trunk/arch/arm/mach-netx/xc.c | 2 +- trunk/arch/arm/mach-ns9xxx/board-a9m9750dev.c | 12 +- trunk/arch/arm/mach-ns9xxx/gpio-ns9360.c | 4 +- trunk/arch/arm/mach-ns9xxx/gpio.c | 6 +- trunk/arch/arm/mach-ns9xxx/irq.c | 7 +- trunk/arch/arm/mach-ns9xxx/mach-cc9p9360dev.c | 2 +- trunk/arch/arm/mach-ns9xxx/mach-cc9p9360js.c | 2 +- trunk/arch/arm/mach-ns9xxx/plat-serial8250.c | 4 +- trunk/arch/arm/mach-ns9xxx/processor-ns9360.c | 4 +- trunk/arch/arm/mach-ns9xxx/time-ns9360.c | 6 +- trunk/arch/arm/mach-omap1/board-ams-delta.c | 2 +- trunk/arch/arm/mach-omap1/board-fsample.c | 2 +- trunk/arch/arm/mach-omap1/board-generic.c | 2 +- trunk/arch/arm/mach-omap1/board-h2.c | 2 +- trunk/arch/arm/mach-omap1/board-h3.c | 2 +- trunk/arch/arm/mach-omap1/board-innovator.c | 2 +- trunk/arch/arm/mach-omap1/board-nokia770.c | 2 +- trunk/arch/arm/mach-omap1/board-osk.c | 2 +- trunk/arch/arm/mach-omap1/board-palmte.c | 2 +- trunk/arch/arm/mach-omap1/board-palmtt.c | 2 +- trunk/arch/arm/mach-omap1/board-palmz71.c | 2 +- trunk/arch/arm/mach-omap1/board-perseus2.c | 2 +- trunk/arch/arm/mach-omap1/board-sx1.c | 2 +- trunk/arch/arm/mach-omap1/board-voiceblue.c | 2 +- trunk/arch/arm/mach-omap1/devices.c | 3 +- trunk/arch/arm/mach-omap1/fpga.c | 2 +- trunk/arch/arm/mach-omap1/irq.c | 2 +- trunk/arch/arm/mach-omap1/leds-h2p2-debug.c | 2 +- trunk/arch/arm/mach-omap1/leds-innovator.c | 2 +- trunk/arch/arm/mach-omap1/leds-osk.c | 2 +- trunk/arch/arm/mach-omap1/pm.c | 1 - trunk/arch/arm/mach-omap1/sram.S | 2 +- trunk/arch/arm/mach-omap1/time.c | 2 +- trunk/arch/arm/mach-omap1/timer32k.c | 2 +- trunk/arch/arm/mach-omap2/board-2430sdp.c | 2 +- trunk/arch/arm/mach-omap2/board-apollon.c | 2 +- trunk/arch/arm/mach-omap2/board-generic.c | 2 +- trunk/arch/arm/mach-omap2/board-h4.c | 2 +- trunk/arch/arm/mach-omap2/devices.c | 2 +- trunk/arch/arm/mach-omap2/irq.c | 2 +- trunk/arch/arm/mach-omap2/pm.c | 1 - trunk/arch/arm/mach-omap2/sram242x.S | 2 +- trunk/arch/arm/mach-omap2/sram243x.S | 2 +- trunk/arch/arm/mach-orion5x/addr-map.c | 2 +- trunk/arch/arm/mach-orion5x/mpp.c | 2 +- trunk/arch/arm/mach-pnx4008/clock.c | 2 +- trunk/arch/arm/mach-pnx4008/core.c | 2 +- trunk/arch/arm/mach-pnx4008/dma.c | 2 +- trunk/arch/arm/mach-pnx4008/irq.c | 3 +- trunk/arch/arm/mach-pnx4008/pm.c | 1 - trunk/arch/arm/mach-pnx4008/serial.c | 2 +- trunk/arch/arm/mach-pnx4008/sleep.S | 2 +- trunk/arch/arm/mach-pnx4008/time.c | 2 +- trunk/arch/arm/mach-pxa/clock.c | 2 +- trunk/arch/arm/mach-pxa/colibri.c | 2 +- trunk/arch/arm/mach-pxa/corgi.c | 2 +- trunk/arch/arm/mach-pxa/corgi_lcd.c | 2 +- trunk/arch/arm/mach-pxa/corgi_pm.c | 2 +- trunk/arch/arm/mach-pxa/corgi_ssp.c | 2 +- trunk/arch/arm/mach-pxa/cpu-pxa.c | 2 +- trunk/arch/arm/mach-pxa/dma.c | 2 +- trunk/arch/arm/mach-pxa/generic.c | 2 +- trunk/arch/arm/mach-pxa/gpio.c | 2 +- trunk/arch/arm/mach-pxa/gumstix.c | 2 +- trunk/arch/arm/mach-pxa/idp.c | 2 +- trunk/arch/arm/mach-pxa/irq.c | 2 +- trunk/arch/arm/mach-pxa/leds-idp.c | 2 +- trunk/arch/arm/mach-pxa/leds-lubbock.c | 2 +- trunk/arch/arm/mach-pxa/leds-mainstone.c | 2 +- trunk/arch/arm/mach-pxa/leds-trizeps4.c | 2 +- trunk/arch/arm/mach-pxa/littleton.c | 2 +- trunk/arch/arm/mach-pxa/lpd270.c | 2 +- trunk/arch/arm/mach-pxa/lubbock.c | 2 +- trunk/arch/arm/mach-pxa/magician.c | 2 +- trunk/arch/arm/mach-pxa/mainstone.c | 2 +- trunk/arch/arm/mach-pxa/mfp-pxa3xx.c | 2 +- trunk/arch/arm/mach-pxa/pcm990-baseboard.c | 1 - trunk/arch/arm/mach-pxa/pm.c | 2 +- trunk/arch/arm/mach-pxa/poodle.c | 2 +- trunk/arch/arm/mach-pxa/pxa25x.c | 2 +- trunk/arch/arm/mach-pxa/pxa27x.c | 2 +- trunk/arch/arm/mach-pxa/pxa300.c | 2 +- trunk/arch/arm/mach-pxa/pxa320.c | 2 +- trunk/arch/arm/mach-pxa/pxa3xx.c | 2 +- trunk/arch/arm/mach-pxa/pxa930.c | 2 +- trunk/arch/arm/mach-pxa/saar.c | 2 +- trunk/arch/arm/mach-pxa/sharpsl_pm.c | 2 +- trunk/arch/arm/mach-pxa/sleep.S | 2 +- trunk/arch/arm/mach-pxa/spitz.c | 2 +- trunk/arch/arm/mach-pxa/spitz_pm.c | 2 +- trunk/arch/arm/mach-pxa/ssp.c | 2 +- trunk/arch/arm/mach-pxa/standby.S | 2 +- trunk/arch/arm/mach-pxa/tavorevb.c | 2 +- trunk/arch/arm/mach-pxa/trizeps4.c | 2 +- trunk/arch/arm/mach-pxa/zylonite.c | 2 +- trunk/arch/arm/mach-realview/core.c | 2 +- trunk/arch/arm/mach-realview/localtimer.c | 2 +- trunk/arch/arm/mach-realview/platsmp.c | 2 +- trunk/arch/arm/mach-realview/realview_eb.c | 2 +- .../arch/arm/mach-realview/realview_pb1176.c | 2 +- .../arch/arm/mach-realview/realview_pb11mp.c | 2 +- trunk/arch/arm/mach-rpc/dma.c | 2 +- trunk/arch/arm/mach-rpc/riscpc.c | 2 +- trunk/arch/arm/mach-s3c2400/gpio.c | 2 +- trunk/arch/arm/mach-s3c2410/bast-irq.c | 2 +- trunk/arch/arm/mach-s3c2410/clock.c | 2 +- trunk/arch/arm/mach-s3c2410/gpio.c | 2 +- trunk/arch/arm/mach-s3c2410/h1940-bluetooth.c | 2 +- trunk/arch/arm/mach-s3c2410/mach-amlm5900.c | 2 +- trunk/arch/arm/mach-s3c2410/mach-bast.c | 2 +- trunk/arch/arm/mach-s3c2410/mach-h1940.c | 2 +- trunk/arch/arm/mach-s3c2410/mach-n30.c | 2 +- trunk/arch/arm/mach-s3c2410/mach-otom.c | 2 +- trunk/arch/arm/mach-s3c2410/mach-qt2410.c | 2 +- trunk/arch/arm/mach-s3c2410/mach-smdk2410.c | 2 +- trunk/arch/arm/mach-s3c2410/mach-tct_hammer.c | 2 +- trunk/arch/arm/mach-s3c2410/mach-vr1000.c | 2 +- trunk/arch/arm/mach-s3c2410/pm-h1940.S | 2 +- trunk/arch/arm/mach-s3c2410/pm.c | 2 +- trunk/arch/arm/mach-s3c2410/s3c2410.c | 2 +- trunk/arch/arm/mach-s3c2410/sleep.S | 2 +- trunk/arch/arm/mach-s3c2410/usb-simtec.c | 2 +- trunk/arch/arm/mach-s3c2412/clock.c | 2 +- trunk/arch/arm/mach-s3c2412/gpio.c | 2 +- trunk/arch/arm/mach-s3c2412/irq.c | 2 +- trunk/arch/arm/mach-s3c2412/mach-smdk2413.c | 2 +- trunk/arch/arm/mach-s3c2412/mach-vstms.c | 2 +- trunk/arch/arm/mach-s3c2412/pm.c | 2 +- trunk/arch/arm/mach-s3c2412/s3c2412.c | 2 +- trunk/arch/arm/mach-s3c2412/sleep.S | 2 +- trunk/arch/arm/mach-s3c2440/clock.c | 2 +- trunk/arch/arm/mach-s3c2440/dsc.c | 2 +- trunk/arch/arm/mach-s3c2440/irq.c | 2 +- trunk/arch/arm/mach-s3c2440/mach-anubis.c | 2 +- trunk/arch/arm/mach-s3c2440/mach-at2440evb.c | 2 +- trunk/arch/arm/mach-s3c2440/mach-nexcoder.c | 2 +- trunk/arch/arm/mach-s3c2440/mach-osiris.c | 2 +- trunk/arch/arm/mach-s3c2440/mach-rx3715.c | 2 +- trunk/arch/arm/mach-s3c2440/mach-smdk2440.c | 2 +- trunk/arch/arm/mach-s3c2440/s3c2440.c | 2 +- trunk/arch/arm/mach-s3c2442/clock.c | 2 +- trunk/arch/arm/mach-s3c2443/clock.c | 2 +- trunk/arch/arm/mach-s3c2443/irq.c | 2 +- trunk/arch/arm/mach-s3c2443/mach-smdk2443.c | 2 +- trunk/arch/arm/mach-s3c2443/s3c2443.c | 2 +- trunk/arch/arm/mach-sa1100/assabet.c | 2 +- trunk/arch/arm/mach-sa1100/badge4.c | 2 +- trunk/arch/arm/mach-sa1100/cerf.c | 2 +- trunk/arch/arm/mach-sa1100/clock.c | 2 +- trunk/arch/arm/mach-sa1100/collie.c | 2 +- trunk/arch/arm/mach-sa1100/collie_pm.c | 3 +- trunk/arch/arm/mach-sa1100/cpu-sa1100.c | 2 +- trunk/arch/arm/mach-sa1100/cpu-sa1110.c | 2 +- trunk/arch/arm/mach-sa1100/dma.c | 2 +- trunk/arch/arm/mach-sa1100/generic.c | 2 +- trunk/arch/arm/mach-sa1100/gpio.c | 2 +- trunk/arch/arm/mach-sa1100/h3600.c | 2 +- trunk/arch/arm/mach-sa1100/hackkit.c | 2 +- trunk/arch/arm/mach-sa1100/irq.c | 2 +- trunk/arch/arm/mach-sa1100/jornada720.c | 2 +- trunk/arch/arm/mach-sa1100/jornada720_ssp.c | 2 +- trunk/arch/arm/mach-sa1100/lart.c | 2 +- trunk/arch/arm/mach-sa1100/leds-assabet.c | 2 +- trunk/arch/arm/mach-sa1100/leds-badge4.c | 2 +- trunk/arch/arm/mach-sa1100/leds-cerf.c | 2 +- trunk/arch/arm/mach-sa1100/leds-hackkit.c | 2 +- trunk/arch/arm/mach-sa1100/leds-lart.c | 2 +- trunk/arch/arm/mach-sa1100/leds-simpad.c | 2 +- trunk/arch/arm/mach-sa1100/neponset.c | 2 +- trunk/arch/arm/mach-sa1100/pleb.c | 2 +- trunk/arch/arm/mach-sa1100/pm.c | 2 +- trunk/arch/arm/mach-sa1100/shannon.c | 2 +- trunk/arch/arm/mach-sa1100/simpad.c | 2 +- trunk/arch/arm/mach-sa1100/sleep.S | 2 +- trunk/arch/arm/mach-sa1100/ssp.c | 2 +- trunk/arch/arm/mach-sa1100/time.c | 2 +- trunk/arch/arm/mach-shark/leds.c | 2 +- trunk/arch/arm/mach-versatile/core.c | 2 +- trunk/arch/arm/mach-versatile/pci.c | 2 +- trunk/arch/arm/mach-versatile/versatile_ab.c | 2 +- trunk/arch/arm/mach-versatile/versatile_pb.c | 2 +- trunk/arch/arm/mm/Kconfig | 10 +- trunk/arch/arm/mm/cache-v3.S | 2 +- trunk/arch/arm/mm/cache-v4.S | 2 +- trunk/arch/arm/mm/cache-v4wt.S | 2 +- trunk/arch/arm/mm/cache-xsc3l2.c | 182 ++++ trunk/arch/arm/mm/init.c | 32 +- trunk/arch/arm/mm/ioremap.c | 2 +- trunk/arch/arm/mm/proc-arm720.S | 2 +- trunk/arch/arm/mm/proc-sa110.S | 2 +- trunk/arch/arm/mm/proc-sa1100.S | 2 +- trunk/arch/arm/mm/proc-xsc3.S | 24 +- trunk/arch/arm/nwfpe/fpa11.h | 2 +- trunk/arch/arm/oprofile/op_model_mpcore.c | 2 +- trunk/arch/arm/plat-iop/i2c.c | 3 +- trunk/arch/arm/plat-iop/io.c | 2 +- trunk/arch/arm/plat-iop/pci.c | 3 +- trunk/arch/arm/plat-iop/time.c | 2 +- trunk/arch/arm/plat-mxc/gpio.c | 2 +- trunk/arch/arm/plat-mxc/iomux-mx1-mx2.c | 2 +- trunk/arch/arm/plat-mxc/time.c | 2 +- trunk/arch/arm/plat-omap/common.c | 2 +- trunk/arch/arm/plat-omap/cpu-omap.c | 2 +- trunk/arch/arm/plat-omap/debug-devices.c | 2 +- trunk/arch/arm/plat-omap/debug-leds.c | 2 +- trunk/arch/arm/plat-omap/devices.c | 2 +- trunk/arch/arm/plat-omap/dma.c | 2 +- trunk/arch/arm/plat-omap/dmtimer.c | 2 +- trunk/arch/arm/plat-omap/fb.c | 3 +- trunk/arch/arm/plat-omap/gpio.c | 2 +- trunk/arch/arm/plat-omap/i2c.c | 1 - trunk/arch/arm/plat-omap/ocpi.c | 2 +- trunk/arch/arm/plat-omap/usb.c | 2 +- trunk/arch/arm/plat-s3c24xx/clock.c | 2 +- trunk/arch/arm/plat-s3c24xx/common-smdk.c | 2 +- trunk/arch/arm/plat-s3c24xx/cpu.c | 2 +- trunk/arch/arm/plat-s3c24xx/devs.c | 2 +- trunk/arch/arm/plat-s3c24xx/dma.c | 2 +- trunk/arch/arm/plat-s3c24xx/gpio.c | 2 +- trunk/arch/arm/plat-s3c24xx/gpiolib.c | 2 +- trunk/arch/arm/plat-s3c24xx/irq.c | 2 +- trunk/arch/arm/plat-s3c24xx/pm-simtec.c | 2 +- trunk/arch/arm/plat-s3c24xx/pm.c | 2 +- trunk/arch/arm/plat-s3c24xx/pwm-clock.c | 2 +- trunk/arch/arm/plat-s3c24xx/s3c244x-clock.c | 2 +- trunk/arch/arm/plat-s3c24xx/s3c244x-irq.c | 2 +- trunk/arch/arm/plat-s3c24xx/s3c244x.c | 2 +- trunk/arch/arm/plat-s3c24xx/sleep.S | 2 +- trunk/arch/arm/tools/Makefile | 1 + trunk/arch/m68k/mac/baboon.c | 1 - trunk/arch/m68k/mac/via.c | 1 - trunk/arch/mips/emma2rh/markeins/setup.c | 1 - trunk/arch/mips/jazz/setup.c | 2 - trunk/arch/mn10300/kernel/module.c | 4 +- trunk/arch/powerpc/Kconfig.debug | 2 +- trunk/arch/powerpc/boot/dts/mpc8610_hpcd.dts | 5 + trunk/arch/powerpc/boot/io.h | 2 +- .../powerpc/include/asm}/8253pit.h | 0 .../powerpc/include/asm}/8xx_immap.h | 0 .../powerpc/include/asm}/Kbuild | 0 .../powerpc/include/asm}/a.out.h | 0 .../powerpc/include/asm}/abs_addr.h | 0 .../powerpc/include/asm}/agp.h | 0 .../powerpc/include/asm}/asm-compat.h | 0 .../powerpc/include/asm}/atomic.h | 0 .../powerpc/include/asm}/auxvec.h | 0 .../powerpc/include/asm}/backlight.h | 0 .../powerpc/include/asm}/bitops.h | 0 .../powerpc/include/asm}/bootx.h | 0 .../powerpc/include/asm}/btext.h | 0 .../powerpc/include/asm}/bug.h | 0 .../powerpc/include/asm}/bugs.h | 0 .../powerpc/include/asm}/byteorder.h | 0 .../powerpc/include/asm}/cache.h | 0 .../powerpc/include/asm}/cacheflush.h | 0 .../powerpc/include/asm}/cell-pmu.h | 0 .../powerpc/include/asm}/cell-regs.h | 0 .../powerpc/include/asm}/checksum.h | 0 .../powerpc/include/asm}/clk_interface.h | 0 .../powerpc/include/asm}/code-patching.h | 0 .../powerpc/include/asm}/compat.h | 0 .../powerpc/include/asm}/cpm.h | 0 .../powerpc/include/asm}/cpm1.h | 0 .../powerpc/include/asm}/cpm2.h | 0 .../powerpc/include/asm}/cputable.h | 0 .../powerpc/include/asm}/cputhreads.h | 0 .../powerpc/include/asm}/cputime.h | 0 .../powerpc/include/asm}/current.h | 0 .../powerpc/include/asm}/dbdma.h | 0 .../powerpc/include/asm}/dcr-generic.h | 0 .../powerpc/include/asm}/dcr-mmio.h | 0 .../powerpc/include/asm}/dcr-native.h | 0 .../powerpc/include/asm}/dcr-regs.h | 0 .../powerpc/include/asm}/dcr.h | 6 +- .../powerpc/include/asm}/delay.h | 0 .../powerpc/include/asm}/device.h | 0 .../powerpc/include/asm}/div64.h | 0 .../powerpc/include/asm}/dma-mapping.h | 0 .../powerpc/include/asm}/dma.h | 0 .../powerpc/include/asm}/edac.h | 0 .../powerpc/include/asm}/eeh.h | 0 .../powerpc/include/asm}/eeh_event.h | 0 .../powerpc/include/asm}/elf.h | 0 .../powerpc/include/asm}/emergency-restart.h | 0 .../powerpc/include/asm}/errno.h | 0 .../powerpc/include/asm}/exception.h | 0 .../powerpc/include/asm}/fb.h | 0 .../powerpc/include/asm}/fcntl.h | 0 .../powerpc/include/asm}/feature-fixups.h | 0 .../powerpc/include/asm}/firmware.h | 0 .../powerpc/include/asm}/fixmap.h | 0 .../powerpc/include/asm}/floppy.h | 0 .../powerpc/include/asm}/fs_pd.h | 0 .../powerpc/include/asm}/fsl_gtm.h | 0 .../powerpc/include/asm}/fsl_lbc.h | 0 .../powerpc/include/asm}/ftrace.h | 0 .../powerpc/include/asm}/futex.h | 0 .../powerpc/include/asm}/gpio.h | 0 .../powerpc/include/asm}/grackle.h | 0 .../powerpc/include/asm}/hardirq.h | 0 .../powerpc/include/asm}/heathrow.h | 0 .../powerpc/include/asm}/highmem.h | 0 .../powerpc/include/asm}/hugetlb.h | 0 .../powerpc/include/asm}/hvcall.h | 0 .../powerpc/include/asm}/hvconsole.h | 0 .../powerpc/include/asm}/hvcserver.h | 0 .../powerpc/include/asm}/hw_irq.h | 0 .../powerpc/include/asm}/hydra.h | 0 .../powerpc/include/asm}/i8259.h | 5 - .../powerpc/include/asm}/ibmebus.h | 0 .../powerpc/include/asm}/ide.h | 1 - .../powerpc/include/asm}/immap_86xx.h | 0 .../powerpc/include/asm}/immap_cpm2.h | 0 .../powerpc/include/asm}/immap_qe.h | 2 - .../powerpc/include/asm}/io-defs.h | 0 .../powerpc/include/asm}/io.h | 0 .../powerpc/include/asm}/ioctl.h | 0 .../powerpc/include/asm}/ioctls.h | 0 .../powerpc/include/asm}/iommu.h | 0 .../powerpc/include/asm}/ipcbuf.h | 0 .../powerpc/include/asm}/ipic.h | 9 - .../powerpc/include/asm}/irq.h | 288 ------ .../powerpc/include/asm}/irq_regs.h | 0 .../powerpc/include/asm}/irqflags.h | 4 +- .../powerpc/include/asm}/iseries/alpaca.h | 0 .../powerpc/include/asm}/iseries/hv_call.h | 0 .../include/asm}/iseries/hv_call_event.h | 0 .../powerpc/include/asm}/iseries/hv_call_sc.h | 0 .../powerpc/include/asm}/iseries/hv_call_xm.h | 0 .../include/asm}/iseries/hv_lp_config.h | 0 .../include/asm}/iseries/hv_lp_event.h | 0 .../powerpc/include/asm}/iseries/hv_types.h | 0 .../powerpc/include/asm}/iseries/iommu.h | 0 .../include/asm}/iseries/it_lp_queue.h | 0 .../powerpc/include/asm}/iseries/lpar_map.h | 0 .../powerpc/include/asm}/iseries/mf.h | 0 .../powerpc/include/asm}/iseries/vio.h | 0 .../powerpc/include/asm}/kdebug.h | 0 .../powerpc/include/asm}/kdump.h | 0 .../powerpc/include/asm}/kexec.h | 0 .../powerpc/include/asm}/keylargo.h | 0 .../powerpc/include/asm}/kgdb.h | 2 - .../powerpc/include/asm}/kmap_types.h | 0 .../powerpc/include/asm}/kprobes.h | 0 .../powerpc/include/asm}/kvm.h | 0 .../powerpc/include/asm}/kvm_asm.h | 0 .../powerpc/include/asm}/kvm_host.h | 0 .../powerpc/include/asm}/kvm_para.h | 0 .../powerpc/include/asm}/kvm_ppc.h | 0 .../powerpc/include/asm}/libata-portmap.h | 0 .../powerpc/include/asm}/linkage.h | 0 .../powerpc/include/asm}/lmb.h | 0 .../powerpc/include/asm}/local.h | 0 .../powerpc/include/asm}/lppaca.h | 0 .../powerpc/include/asm}/lv1call.h | 0 .../powerpc/include/asm}/machdep.h | 0 .../powerpc/include/asm}/macio.h | 0 .../powerpc/include/asm}/mc146818rtc.h | 0 .../powerpc/include/asm}/mediabay.h | 0 .../powerpc/include/asm}/mman.h | 0 .../powerpc/include/asm}/mmu-40x.h | 0 .../powerpc/include/asm}/mmu-44x.h | 0 .../powerpc/include/asm}/mmu-8xx.h | 0 .../powerpc/include/asm}/mmu-fsl-booke.h | 0 .../powerpc/include/asm}/mmu-hash32.h | 0 .../powerpc/include/asm}/mmu-hash64.h | 0 .../powerpc/include/asm}/mmu.h | 0 .../powerpc/include/asm}/mmu_context.h | 0 .../powerpc/include/asm}/mmzone.h | 0 .../powerpc/include/asm}/module.h | 0 .../powerpc/include/asm}/mpc512x.h | 0 .../powerpc/include/asm}/mpc52xx.h | 0 .../powerpc/include/asm}/mpc52xx_psc.h | 0 .../powerpc/include/asm}/mpc6xx.h | 0 .../powerpc/include/asm}/mpc8260.h | 0 .../powerpc/include/asm}/mpc86xx.h | 0 .../powerpc/include/asm}/mpc8xx.h | 0 .../powerpc/include/asm}/mpic.h | 0 .../powerpc/include/asm}/msgbuf.h | 0 .../powerpc/include/asm}/mutex.h | 0 .../powerpc/include/asm}/nvram.h | 0 .../powerpc/include/asm}/of_device.h | 0 .../powerpc/include/asm}/of_platform.h | 0 .../powerpc/include/asm}/ohare.h | 0 .../powerpc/include/asm}/oprofile_impl.h | 0 .../powerpc/include/asm}/pSeries_reconfig.h | 0 .../powerpc/include/asm}/paca.h | 2 - .../powerpc/include/asm}/page.h | 0 .../powerpc/include/asm}/page_32.h | 0 .../powerpc/include/asm}/page_64.h | 0 .../powerpc/include/asm}/param.h | 0 .../powerpc/include/asm}/parport.h | 0 .../powerpc/include/asm}/pasemi_dma.h | 0 .../powerpc/include/asm}/pci-bridge.h | 0 .../powerpc/include/asm}/pci.h | 0 .../powerpc/include/asm}/percpu.h | 0 .../powerpc/include/asm}/pgalloc-32.h | 0 .../powerpc/include/asm}/pgalloc-64.h | 0 .../powerpc/include/asm}/pgalloc.h | 0 .../powerpc/include/asm}/pgtable-4k.h | 0 .../powerpc/include/asm}/pgtable-64k.h | 0 .../powerpc/include/asm}/pgtable-ppc32.h | 0 .../powerpc/include/asm}/pgtable-ppc64.h | 2 +- .../powerpc/include/asm}/pgtable.h | 0 .../powerpc/include/asm}/phyp_dump.h | 0 .../powerpc/include/asm}/pmac_feature.h | 0 .../powerpc/include/asm}/pmac_low_i2c.h | 0 .../powerpc/include/asm}/pmac_pfunc.h | 0 .../powerpc/include/asm}/pmc.h | 0 .../powerpc/include/asm}/pmi.h | 0 .../powerpc/include/asm}/poll.h | 0 .../powerpc/include/asm}/posix_types.h | 0 .../powerpc/include/asm}/ppc-pci.h | 0 .../powerpc/include/asm}/ppc4xx.h | 0 .../powerpc/include/asm}/ppc_asm.h | 0 .../powerpc/include/asm}/processor.h | 0 .../powerpc/include/asm}/prom.h | 0 .../powerpc/include/asm}/ps3.h | 0 .../powerpc/include/asm}/ps3av.h | 0 .../powerpc/include/asm}/ps3fb.h | 0 .../powerpc/include/asm}/ps3stor.h | 0 .../powerpc/include/asm}/ptrace.h | 0 .../powerpc/include/asm}/qe.h | 0 .../powerpc/include/asm}/qe_ic.h | 2 - .../powerpc/include/asm}/reg.h | 0 .../powerpc/include/asm}/reg_8xx.h | 0 .../powerpc/include/asm}/reg_booke.h | 0 .../powerpc/include/asm}/reg_fsl_emb.h | 0 .../powerpc/include/asm}/resource.h | 0 .../powerpc/include/asm}/rheap.h | 0 .../powerpc/include/asm}/rio.h | 0 .../powerpc/include/asm}/rtas.h | 0 .../powerpc/include/asm}/rtc.h | 0 .../powerpc/include/asm}/rwsem.h | 4 +- .../powerpc/include/asm}/scatterlist.h | 0 .../powerpc/include/asm}/seccomp.h | 0 .../powerpc/include/asm}/sections.h | 0 .../powerpc/include/asm}/sembuf.h | 0 .../powerpc/include/asm}/serial.h | 0 .../powerpc/include/asm}/setjmp.h | 0 .../powerpc/include/asm}/setup.h | 0 .../powerpc/include/asm}/shmbuf.h | 0 .../powerpc/include/asm}/shmparam.h | 0 .../powerpc/include/asm}/sigcontext.h | 0 .../powerpc/include/asm}/siginfo.h | 0 .../powerpc/include/asm}/signal.h | 0 .../powerpc/include/asm}/smp.h | 0 .../powerpc/include/asm}/smu.h | 0 .../powerpc/include/asm}/socket.h | 0 .../powerpc/include/asm}/sockios.h | 0 .../powerpc/include/asm}/sparsemem.h | 0 .../powerpc/include/asm}/spinlock.h | 0 .../powerpc/include/asm}/spinlock_types.h | 0 .../powerpc/include/asm}/spu.h | 0 .../powerpc/include/asm}/spu_csa.h | 0 .../powerpc/include/asm}/spu_info.h | 0 .../powerpc/include/asm}/spu_priv1.h | 0 .../powerpc/include/asm}/sstep.h | 0 .../powerpc/include/asm}/stat.h | 0 .../powerpc/include/asm}/statfs.h | 0 .../powerpc/include/asm}/string.h | 0 .../powerpc/include/asm}/suspend.h | 0 .../powerpc/include/asm}/synch.h | 0 .../powerpc/include/asm}/syscall.h | 0 .../powerpc/include/asm}/syscalls.h | 0 .../powerpc/include/asm}/systbl.h | 0 .../powerpc/include/asm}/system.h | 0 .../powerpc/include/asm}/tce.h | 0 .../powerpc/include/asm}/termbits.h | 0 .../powerpc/include/asm}/termios.h | 0 .../powerpc/include/asm}/thread_info.h | 0 .../powerpc/include/asm}/time.h | 0 .../powerpc/include/asm}/timex.h | 0 .../powerpc/include/asm}/tlb.h | 0 .../powerpc/include/asm}/tlbflush.h | 0 .../powerpc/include/asm}/topology.h | 0 .../powerpc/include/asm}/tsi108.h | 0 .../powerpc/include/asm}/tsi108_irq.h | 0 .../powerpc/include/asm}/tsi108_pci.h | 0 .../powerpc/include/asm}/types.h | 0 .../powerpc/include/asm}/uaccess.h | 0 .../powerpc/include/asm}/ucc.h | 0 .../powerpc/include/asm}/ucc_fast.h | 2 - .../powerpc/include/asm}/ucc_slow.h | 0 .../powerpc/include/asm}/ucontext.h | 0 .../powerpc/include/asm}/udbg.h | 0 .../powerpc/include/asm}/uic.h | 2 - .../powerpc/include/asm}/unaligned.h | 0 .../powerpc/include/asm}/uninorth.h | 0 .../powerpc/include/asm}/unistd.h | 0 .../powerpc/include/asm}/user.h | 0 .../powerpc/include/asm}/vdso.h | 0 .../powerpc/include/asm}/vdso_datapage.h | 0 .../powerpc/include/asm}/vga.h | 0 .../powerpc/include/asm}/vio.h | 0 .../powerpc/include/asm}/xilinx_intc.h | 0 .../powerpc/include/asm}/xmon.h | 0 .../powerpc/include/asm}/xor.h | 0 trunk/arch/powerpc/kernel/Makefile | 14 - trunk/arch/powerpc/kernel/cpu_setup_44x.S | 6 - trunk/arch/powerpc/kernel/irq.c | 25 +- trunk/arch/powerpc/kernel/process.c | 2 - trunk/arch/powerpc/kernel/vdso.c | 2 - trunk/arch/powerpc/lib/Makefile | 2 - trunk/arch/powerpc/mm/mem.c | 2 +- trunk/arch/powerpc/mm/ppc_mmu_32.c | 4 +- trunk/arch/powerpc/mm/tlb_64.c | 2 +- trunk/arch/powerpc/platforms/52xx/Makefile | 4 +- .../arch/powerpc/platforms/86xx/mpc86xx_smp.c | 2 +- trunk/arch/powerpc/platforms/Makefile | 6 - .../arch/powerpc/platforms/powermac/Makefile | 3 +- trunk/arch/powerpc/sysdev/Makefile | 2 - .../asm-s390 => arch/s390/include/asm}/Kbuild | 0 .../asm-s390 => arch/s390/include/asm}/airq.h | 0 .../s390/include/asm}/appldata.h | 0 .../s390/include/asm}/atomic.h | 0 .../s390/include/asm}/auxvec.h | 0 .../s390/include/asm}/bitops.h | 0 .../asm-s390 => arch/s390/include/asm}/bug.h | 0 .../asm-s390 => arch/s390/include/asm}/bugs.h | 0 .../s390/include/asm}/byteorder.h | 0 .../s390/include/asm}/cache.h | 0 .../s390/include/asm}/cacheflush.h | 0 .../s390/include/asm}/ccwdev.h | 0 .../s390/include/asm}/ccwgroup.h | 0 .../s390/include/asm}/checksum.h | 0 .../s390/include/asm}/chpid.h | 0 .../asm-s390 => arch/s390/include/asm}/chsc.h | 0 .../asm-s390 => arch/s390/include/asm}/cio.h | 0 .../asm-s390 => arch/s390/include/asm}/cmb.h | 0 .../s390/include/asm}/compat.h | 0 .../s390/include/asm}/cpcmd.h | 0 .../asm-s390 => arch/s390/include/asm}/cpu.h | 0 .../s390/include/asm}/cputime.h | 0 .../s390/include/asm}/current.h | 0 .../asm-s390 => arch/s390/include/asm}/dasd.h | 0 .../s390/include/asm}/debug.h | 0 .../s390/include/asm}/delay.h | 0 .../s390/include/asm}/device.h | 0 .../asm-s390 => arch/s390/include/asm}/diag.h | 0 .../s390/include/asm}/div64.h | 0 .../asm-s390 => arch/s390/include/asm}/dma.h | 0 .../s390/include/asm}/ebcdic.h | 0 .../asm-s390 => arch/s390/include/asm}/elf.h | 0 .../s390/include/asm}/emergency-restart.h | 0 .../s390/include/asm}/errno.h | 0 .../asm-s390 => arch/s390/include/asm}/etr.h | 0 .../s390/include/asm}/extmem.h | 0 .../asm-s390 => arch/s390/include/asm}/fb.h | 0 .../s390/include/asm}/fcntl.h | 0 .../asm-s390 => arch/s390/include/asm}/fcx.h | 0 .../s390/include/asm}/futex.h | 0 .../s390/include/asm}/hardirq.h | 0 .../s390/include/asm}/hugetlb.h | 0 .../s390/include/asm}/idals.h | 0 .../asm-s390 => arch/s390/include/asm}/io.h | 0 .../s390/include/asm}/ioctl.h | 0 .../s390/include/asm}/ioctls.h | 0 .../s390/include/asm}/ipcbuf.h | 0 .../asm-s390 => arch/s390/include/asm}/ipl.h | 0 .../asm-s390 => arch/s390/include/asm}/irq.h | 0 .../s390/include/asm}/irq_regs.h | 0 .../s390/include/asm}/irqflags.h | 0 .../asm-s390 => arch/s390/include/asm}/isc.h | 0 .../asm-s390 => arch/s390/include/asm}/itcw.h | 0 .../s390/include/asm}/kdebug.h | 0 .../s390/include/asm}/kexec.h | 0 .../s390/include/asm}/kmap_types.h | 0 .../s390/include/asm}/kprobes.h | 0 .../asm-s390 => arch/s390/include/asm}/kvm.h | 0 .../s390/include/asm}/kvm_host.h | 0 .../s390/include/asm}/kvm_para.h | 0 .../s390/include/asm}/kvm_virtio.h | 0 .../s390/include/asm}/linkage.h | 0 .../s390/include/asm}/local.h | 0 .../s390/include/asm}/lowcore.h | 0 .../s390/include/asm}/mathemu.h | 0 .../asm-s390 => arch/s390/include/asm}/mman.h | 0 .../asm-s390 => arch/s390/include/asm}/mmu.h | 0 .../s390/include/asm}/mmu_context.h | 0 .../s390/include/asm}/module.h | 0 .../s390/include/asm}/monwriter.h | 0 .../s390/include/asm}/msgbuf.h | 0 .../s390/include/asm}/mutex.h | 0 .../asm-s390 => arch/s390/include/asm}/page.h | 0 .../s390/include/asm}/param.h | 0 .../asm-s390 => arch/s390/include/asm}/pci.h | 0 .../s390/include/asm}/percpu.h | 0 .../s390/include/asm}/pgalloc.h | 0 .../s390/include/asm}/pgtable.h | 0 .../asm-s390 => arch/s390/include/asm}/poll.h | 0 .../s390/include/asm}/posix_types.h | 0 .../s390/include/asm}/processor.h | 0 .../s390/include/asm}/ptrace.h | 0 .../asm-s390 => arch/s390/include/asm}/qdio.h | 0 .../asm-s390 => arch/s390/include/asm}/qeth.h | 0 .../s390/include/asm}/reset.h | 0 .../s390/include/asm}/resource.h | 0 .../s390/include/asm}/rwsem.h | 0 .../s390/include/asm}/s390_ext.h | 0 .../s390/include/asm}/s390_rdev.h | 0 .../s390/include/asm}/scatterlist.h | 0 .../s390/include/asm}/schid.h | 0 .../asm-s390 => arch/s390/include/asm}/sclp.h | 0 .../s390/include/asm}/sections.h | 0 .../s390/include/asm}/segment.h | 0 .../s390/include/asm}/sembuf.h | 0 .../s390/include/asm}/setup.h | 0 .../s390/include/asm}/sfp-machine.h | 0 .../s390/include/asm}/sfp-util.h | 0 .../s390/include/asm}/shmbuf.h | 0 .../s390/include/asm}/shmparam.h | 0 .../s390/include/asm}/sigcontext.h | 0 .../s390/include/asm}/siginfo.h | 0 .../s390/include/asm}/signal.h | 0 .../asm-s390 => arch/s390/include/asm}/sigp.h | 0 .../asm-s390 => arch/s390/include/asm}/smp.h | 0 .../s390/include/asm}/socket.h | 0 .../s390/include/asm}/sockios.h | 0 .../s390/include/asm}/sparsemem.h | 0 .../s390/include/asm}/spinlock.h | 0 .../s390/include/asm}/spinlock_types.h | 0 .../asm-s390 => arch/s390/include/asm}/stat.h | 0 .../s390/include/asm}/statfs.h | 0 .../s390/include/asm}/string.h | 0 .../s390/include/asm}/suspend.h | 0 .../s390/include/asm}/sysinfo.h | 0 .../s390/include/asm}/system.h | 0 .../s390/include/asm}/tape390.h | 0 .../s390/include/asm}/termbits.h | 0 .../s390/include/asm}/termios.h | 0 .../s390/include/asm}/thread_info.h | 0 .../s390/include/asm}/timer.h | 0 .../s390/include/asm}/timex.h | 0 .../asm-s390 => arch/s390/include/asm}/tlb.h | 0 .../s390/include/asm}/tlbflush.h | 0 .../s390/include/asm}/todclk.h | 0 .../s390/include/asm}/topology.h | 0 .../s390/include/asm}/types.h | 0 .../s390/include/asm}/uaccess.h | 0 .../s390/include/asm}/ucontext.h | 0 .../s390/include/asm}/unaligned.h | 0 .../s390/include/asm}/unistd.h | 0 .../asm-s390 => arch/s390/include/asm}/user.h | 0 .../asm-s390 => arch/s390/include/asm}/vtoc.h | 0 .../asm-s390 => arch/s390/include/asm}/xor.h | 0 .../s390/include/asm}/zcrypt.h | 0 trunk/arch/sh/Kconfig | 27 +- trunk/arch/sh/Kconfig.debug | 2 +- trunk/arch/sh/Makefile | 16 +- trunk/arch/sh/boards/Makefile | 2 +- trunk/arch/sh/boards/board-ap325rxa.c | 1 - trunk/arch/sh/boards/mach-se/7343/irq.c | 1 - trunk/arch/sh/boards/mach-systemh/irq.c | 3 +- trunk/arch/sh/configs/dreamcast_defconfig | 14 +- trunk/arch/sh/include/asm/a.out.h | 20 - trunk/arch/sh/include/asm/ptrace.h | 9 + trunk/arch/sh/include/asm/seccomp.h | 10 + trunk/arch/sh/include/asm/thread_info.h | 51 +- trunk/arch/sh/include/asm/tlb_64.h | 12 +- trunk/arch/sh/include/cpu-sh2/cpu/cache.h | 6 +- .../arch/sh/include/cpu-sh2a/cpu/addrspace.h | 10 + trunk/arch/sh/include/cpu-sh2a/cpu/cache.h | 3 + .../arch/sh/include/cpu-sh2a/cpu/cacheflush.h | 34 + trunk/arch/sh/kernel/cpu/sh4/sq.c | 2 +- trunk/arch/sh/kernel/cpu/sh5/entry.S | 19 +- trunk/arch/sh/kernel/entry-common.S | 16 +- trunk/arch/sh/kernel/machine_kexec.c | 8 + trunk/arch/sh/kernel/module.c | 7 +- trunk/arch/sh/kernel/ptrace_32.c | 157 ++- trunk/arch/sh/kernel/ptrace_64.c | 144 +-- trunk/arch/sh/kernel/setup.c | 20 + trunk/arch/sh/kernel/signal_32.c | 22 +- trunk/arch/sh/kernel/signal_64.c | 166 ++-- trunk/arch/sh/mm/Kconfig | 1 - trunk/arch/sh/mm/Makefile_32 | 11 +- trunk/arch/sh/mm/cache-sh2.c | 45 +- trunk/arch/sh/mm/cache-sh2a.c | 129 +++ trunk/arch/sh/mm/tlb-sh5.c | 20 +- trunk/arch/sh/tools/Makefile | 4 +- trunk/arch/sparc/include/asm/futex_64.h | 2 +- trunk/arch/sparc/include/asm/irq_64.h | 3 + trunk/arch/sparc/include/asm/of_platform.h | 26 +- trunk/arch/sparc/include/asm/of_platform_32.h | 24 - trunk/arch/sparc/include/asm/of_platform_64.h | 25 - trunk/arch/sparc/include/asm/ptrace_32.h | 20 +- trunk/arch/sparc/include/asm/ptrace_64.h | 39 +- trunk/arch/sparc64/kernel/irq.c | 19 +- trunk/arch/sparc64/kernel/of_device.c | 5 - trunk/arch/sparc64/kernel/process.c | 110 +-- trunk/arch/sparc64/kernel/signal.c | 7 +- trunk/arch/sparc64/kernel/smp.c | 298 +++--- trunk/arch/sparc64/kernel/sparc64_ksyms.c | 1 - trunk/arch/sparc64/kernel/traps.c | 10 +- trunk/arch/sparc64/mm/tsb.c | 5 +- trunk/arch/sparc64/mm/ultra.S | 42 +- trunk/arch/xtensa/kernel/xtensa_ksyms.c | 1 - trunk/block/scsi_ioctl.c | 2 +- trunk/drivers/block/cciss.c | 2 - trunk/drivers/cdrom/cdrom.c | 4 - trunk/drivers/char/ds1620.c | 2 +- trunk/drivers/char/efirtc.c | 1 - trunk/drivers/char/hvc_console.h | 2 +- trunk/drivers/char/hvcs.c | 2 +- trunk/drivers/char/hw_random/ixp4xx-rng.c | 2 +- trunk/drivers/char/vt.c | 2 - trunk/drivers/i2c/busses/i2c-acorn.c | 2 +- trunk/drivers/i2c/busses/i2c-davinci.c | 3 +- trunk/drivers/i2c/busses/i2c-ixp2000.c | 2 +- trunk/drivers/i2c/busses/i2c-pnx.c | 2 +- trunk/drivers/i2c/busses/i2c-pxa.c | 2 +- trunk/drivers/i2c/busses/i2c-s3c2410.c | 2 +- trunk/drivers/i2c/chips/menelaus.c | 1 - trunk/drivers/ide/Kconfig | 10 - trunk/drivers/ide/arm/ide_arm.c | 1 - trunk/drivers/ide/arm/palm_bk3710.c | 2 +- trunk/drivers/ide/ide-cd.c | 30 +- trunk/drivers/ide/ide-disk.c | 11 +- trunk/drivers/ide/ide-dma.c | 6 +- trunk/drivers/ide/ide-floppy.c | 11 +- trunk/drivers/ide/ide-iops.c | 6 +- trunk/drivers/ide/ide-tape.c | 11 +- trunk/drivers/ide/pci/aec62xx.c | 2 +- trunk/drivers/ide/pci/alim15x3.c | 2 +- trunk/drivers/ide/pci/amd74xx.c | 2 +- trunk/drivers/ide/pci/atiixp.c | 2 +- trunk/drivers/ide/pci/cmd64x.c | 2 +- trunk/drivers/ide/pci/cs5520.c | 1 + trunk/drivers/ide/pci/cs5535.c | 2 +- trunk/drivers/ide/pci/hpt366.c | 2 +- trunk/drivers/ide/pci/it8213.c | 2 +- trunk/drivers/ide/pci/it821x.c | 4 +- trunk/drivers/ide/pci/jmicron.c | 2 +- trunk/drivers/ide/pci/pdc202xx_new.c | 2 +- trunk/drivers/ide/pci/pdc202xx_old.c | 2 +- trunk/drivers/ide/pci/piix.c | 2 +- trunk/drivers/ide/pci/scc_pata.c | 2 +- trunk/drivers/ide/pci/serverworks.c | 8 +- trunk/drivers/ide/pci/siimage.c | 4 +- trunk/drivers/ide/pci/sis5513.c | 2 +- trunk/drivers/ide/pci/slc90e66.c | 2 +- trunk/drivers/ide/pci/tc86c001.c | 2 +- trunk/drivers/ide/pci/via82cxxx.c | 2 +- trunk/drivers/infiniband/hw/ehca/ehca_reqs.c | 2 +- trunk/drivers/input/keyboard/jornada720_kbd.c | 2 +- trunk/drivers/input/keyboard/maple_keyb.c | 172 ++-- trunk/drivers/input/keyboard/omap-keypad.c | 3 +- trunk/drivers/input/keyboard/pxa27x_keypad.c | 1 - trunk/drivers/input/misc/ixp4xx-beeper.c | 2 +- trunk/drivers/input/mouse/rpcmouse.c | 2 +- trunk/drivers/input/serio/rpckbd.c | 2 +- .../drivers/input/touchscreen/jornada720_ts.c | 2 +- trunk/drivers/isdn/Makefile | 2 +- trunk/drivers/isdn/hardware/mISDN/hfcmulti.c | 37 +- trunk/drivers/isdn/hardware/mISDN/hfcpci.c | 2 +- trunk/drivers/isdn/mISDN/l1oip_core.c | 6 +- trunk/drivers/isdn/mISDN/socket.c | 4 +- trunk/drivers/leds/leds-corgi.c | 1 - trunk/drivers/leds/leds-h1940.c | 2 +- trunk/drivers/leds/leds-locomo.c | 2 +- trunk/drivers/leds/leds-s3c24xx.c | 2 +- trunk/drivers/macintosh/mediabay.c | 1 - trunk/drivers/media/video/vino.c | 1 + trunk/drivers/mfd/mcp-sa11x0.c | 2 +- trunk/drivers/mfd/ucb1x00-core.c | 2 +- trunk/drivers/misc/sgi-gru/grutlbpurge.c | 1 - trunk/drivers/mmc/host/omap.c | 1 - trunk/drivers/mtd/maps/autcpu12-nvram.c | 2 +- trunk/drivers/mtd/maps/ceiva.c | 2 +- trunk/drivers/mtd/maps/h720x-flash.c | 2 +- trunk/drivers/mtd/maps/integrator-flash.c | 2 +- trunk/drivers/mtd/maps/ipaq-flash.c | 4 +- trunk/drivers/mtd/maps/ixp2000.c | 2 +- trunk/drivers/mtd/maps/omap_nor.c | 2 +- trunk/drivers/mtd/maps/pxa2xx-flash.c | 2 +- trunk/drivers/mtd/maps/sa1100-flash.c | 2 +- trunk/drivers/mtd/mtdsuper.c | 17 +- trunk/drivers/mtd/nand/sharpsl.c | 2 +- trunk/drivers/net/arm/am79c961a.c | 2 +- trunk/drivers/net/irda/ep7211-sir.c | 2 +- trunk/drivers/net/irda/sa1100_ir.c | 2 +- trunk/drivers/net/ixp2000/ixp2400-msf.c | 2 +- trunk/drivers/net/ixp2000/ixpdev.c | 1 - trunk/drivers/net/netx-eth.c | 1 - trunk/drivers/net/stnic.c | 2 +- trunk/drivers/net/tg3.c | 20 +- trunk/drivers/net/wireless/Kconfig | 1 + trunk/drivers/net/wireless/ath5k/ath5k.h | 8 +- trunk/drivers/net/wireless/ath5k/base.c | 1 + trunk/drivers/net/wireless/ath5k/debug.c | 2 +- trunk/drivers/net/wireless/ath5k/debug.h | 1 - trunk/drivers/net/wireless/ath5k/hw.c | 239 +++-- trunk/drivers/net/wireless/ath5k/initvals.c | 4 +- trunk/drivers/net/wireless/ath5k/phy.c | 185 +++- trunk/drivers/net/wireless/ath5k/reg.h | 934 +++++++++++++----- trunk/drivers/net/wireless/ipw2200.c | 5 +- trunk/drivers/net/wireless/iwlwifi/Kconfig | 98 +- trunk/drivers/net/wireless/iwlwifi/Makefile | 13 +- .../net/wireless/iwlwifi/iwl-3945-led.c | 33 +- .../net/wireless/iwlwifi/iwl-3945-led.h | 1 + trunk/drivers/net/wireless/iwlwifi/iwl-3945.c | 17 +- trunk/drivers/net/wireless/iwlwifi/iwl-4965.c | 156 +-- trunk/drivers/net/wireless/iwlwifi/iwl-5000.c | 71 +- .../iwlwifi/{iwl-4965-rs.c => iwl-agn-rs.c} | 327 +++--- .../iwlwifi/{iwl-4965-rs.h => iwl-agn-rs.h} | 23 +- .../iwlwifi/{iwl4965-base.c => iwl-agn.c} | 232 +++-- .../net/wireless/iwlwifi/iwl-commands.h | 44 +- trunk/drivers/net/wireless/iwlwifi/iwl-core.c | 7 +- trunk/drivers/net/wireless/iwlwifi/iwl-core.h | 3 +- trunk/drivers/net/wireless/iwlwifi/iwl-csr.h | 10 +- .../drivers/net/wireless/iwlwifi/iwl-debug.h | 4 +- .../net/wireless/iwlwifi/iwl-debugfs.c | 11 +- trunk/drivers/net/wireless/iwlwifi/iwl-dev.h | 22 +- .../drivers/net/wireless/iwlwifi/iwl-eeprom.c | 3 +- trunk/drivers/net/wireless/iwlwifi/iwl-hcmd.c | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-led.c | 69 +- trunk/drivers/net/wireless/iwlwifi/iwl-led.h | 1 + .../drivers/net/wireless/iwlwifi/iwl-power.c | 45 +- .../drivers/net/wireless/iwlwifi/iwl-power.h | 33 +- trunk/drivers/net/wireless/iwlwifi/iwl-prph.h | 12 +- trunk/drivers/net/wireless/iwlwifi/iwl-rx.c | 59 +- trunk/drivers/net/wireless/iwlwifi/iwl-scan.c | 1 + trunk/drivers/net/wireless/iwlwifi/iwl-sta.c | 4 +- trunk/drivers/net/wireless/iwlwifi/iwl-tx.c | 86 +- .../net/wireless/iwlwifi/iwl3945-base.c | 58 +- trunk/drivers/net/wireless/libertas/main.c | 15 +- trunk/drivers/net/wireless/p54/p54.h | 1 + trunk/drivers/net/wireless/p54/p54common.c | 6 + .../drivers/net/wireless/prism54/isl_ioctl.c | 2 +- trunk/drivers/net/wireless/rt2x00/rt2500pci.c | 1 + trunk/drivers/net/wireless/rt2x00/rt2500usb.c | 20 +- trunk/drivers/net/wireless/rt2x00/rt2x00.h | 6 + .../net/wireless/rt2x00/rt2x00config.c | 4 + .../drivers/net/wireless/rt2x00/rt2x00debug.c | 17 +- trunk/drivers/net/wireless/rt2x00/rt2x00mac.c | 1 + .../drivers/net/wireless/rt2x00/rt2x00queue.c | 5 +- trunk/drivers/net/wireless/rt2x00/rt2x00usb.c | 4 +- trunk/drivers/net/wireless/rt2x00/rt2x00usb.h | 2 +- trunk/drivers/net/wireless/rt2x00/rt61pci.c | 5 + trunk/drivers/net/wireless/rtl8187.h | 4 + trunk/drivers/net/wireless/rtl8187_dev.c | 17 +- trunk/drivers/pcmcia/at91_cf.c | 2 +- trunk/drivers/pcmcia/omap_cf.c | 2 +- trunk/drivers/pcmcia/pxa2xx_base.c | 2 +- trunk/drivers/pcmcia/pxa2xx_lubbock.c | 2 +- trunk/drivers/pcmcia/pxa2xx_mainstone.c | 2 +- trunk/drivers/pcmcia/pxa2xx_sharpsl.c | 2 +- trunk/drivers/pcmcia/rsrc_nonstatic.c | 2 +- trunk/drivers/pcmcia/sa1100_assabet.c | 2 +- trunk/drivers/pcmcia/sa1100_badge4.c | 2 +- trunk/drivers/pcmcia/sa1100_cerf.c | 2 +- trunk/drivers/pcmcia/sa1100_h3600.c | 2 +- trunk/drivers/pcmcia/sa1100_jornada720.c | 2 +- trunk/drivers/pcmcia/sa1100_neponset.c | 2 +- trunk/drivers/pcmcia/sa1100_shannon.c | 2 +- trunk/drivers/pcmcia/sa1100_simpad.c | 2 +- trunk/drivers/pcmcia/sa1111_generic.c | 2 +- trunk/drivers/pcmcia/sa11xx_base.c | 2 +- trunk/drivers/pcmcia/soc_common.c | 2 +- trunk/drivers/rtc/rtc-bfin.c | 105 +- trunk/drivers/rtc/rtc-ep93xx.c | 2 +- trunk/drivers/rtc/rtc-s3c.c | 2 +- trunk/drivers/rtc/rtc-sa1100.c | 2 +- trunk/drivers/scsi/arm/acornscsi-io.S | 2 +- trunk/drivers/scsi/hptiop.c | 8 +- trunk/drivers/scsi/ide-scsi.c | 11 +- trunk/drivers/scsi/scsi_transport_spi.c | 8 +- trunk/drivers/scsi/ses.c | 18 +- trunk/drivers/scsi/sg.c | 2 +- trunk/drivers/serial/21285.c | 2 +- trunk/drivers/serial/bfin_5xx.c | 2 +- trunk/drivers/serial/clps711x.c | 2 +- trunk/drivers/serial/crisv10.c | 79 +- trunk/drivers/serial/crisv10.h | 3 +- trunk/drivers/serial/imx.c | 2 +- trunk/drivers/serial/netx-serial.c | 2 +- trunk/drivers/serial/pxa.c | 2 +- trunk/drivers/serial/s3c2400.c | 2 +- trunk/drivers/serial/s3c2410.c | 2 +- trunk/drivers/serial/s3c2412.c | 2 +- trunk/drivers/serial/s3c2440.c | 2 +- trunk/drivers/serial/sa1100.c | 2 +- trunk/drivers/serial/samsung.c | 2 +- trunk/drivers/sh/maple/maple.c | 65 +- trunk/drivers/spi/Kconfig | 6 + trunk/drivers/spi/Makefile | 1 + trunk/drivers/spi/atmel_spi.c | 17 +- trunk/drivers/spi/omap_uwire.c | 2 +- trunk/drivers/spi/orion_spi.c | 574 +++++++++++ trunk/drivers/spi/pxa2xx_spi.c | 1 - trunk/drivers/spi/spi_imx.c | 1 - trunk/drivers/spi/spi_s3c24xx.c | 27 +- trunk/drivers/spi/spi_s3c24xx_gpio.c | 2 +- trunk/drivers/usb/core/message.c | 2 +- trunk/drivers/usb/gadget/at91_udc.c | 3 +- trunk/drivers/usb/gadget/lh7a40x_udc.h | 2 +- trunk/drivers/usb/gadget/pxa27x_udc.c | 2 +- trunk/drivers/usb/gadget/s3c2410_udc.c | 1 - trunk/drivers/usb/host/ohci-at91.c | 3 +- trunk/drivers/usb/host/ohci-ep93xx.c | 3 +- trunk/drivers/usb/host/ohci-lh7a404.c | 2 +- trunk/drivers/usb/host/ohci-omap.c | 2 +- trunk/drivers/usb/host/ohci-pnx4008.c | 3 +- trunk/drivers/usb/host/ohci-pxa27x.c | 3 +- trunk/drivers/usb/host/ohci-s3c2410.c | 2 +- trunk/drivers/usb/host/ohci-sa1111.c | 2 +- trunk/drivers/usb/storage/freecom.c | 2 - trunk/drivers/video/acornfb.c | 2 +- trunk/drivers/video/arkfb.c | 18 +- trunk/drivers/video/aty/atyfb_base.c | 29 +- trunk/drivers/video/aty/radeon_accel.c | 4 +- trunk/drivers/video/aty/radeon_i2c.c | 3 +- trunk/drivers/video/backlight/pwm_bl.c | 10 +- trunk/drivers/video/clps711xfb.c | 2 +- trunk/drivers/video/console/.gitignore | 2 + trunk/drivers/video/console/fbcon.c | 3 + trunk/drivers/video/fsl-diu-fb.c | 8 +- trunk/drivers/video/imxfb.c | 2 +- trunk/drivers/video/omap/omapfb_main.c | 1 - trunk/drivers/video/pxafb.c | 2 +- trunk/drivers/video/s3fb.c | 18 +- trunk/drivers/video/sa1100fb.c | 2 +- trunk/drivers/video/vt8623fb.c | 20 +- trunk/drivers/watchdog/ar7_wdt.c | 29 +- trunk/drivers/watchdog/davinci_wdt.c | 2 +- trunk/drivers/watchdog/ep93xx_wdt.c | 2 +- trunk/drivers/watchdog/iop_wdt.c | 2 +- trunk/drivers/watchdog/it8712f_wdt.c | 77 +- trunk/drivers/watchdog/ixp2000_wdt.c | 2 +- trunk/drivers/watchdog/ixp4xx_wdt.c | 2 +- trunk/drivers/watchdog/omap_wdt.c | 2 +- trunk/drivers/watchdog/pnx4008_wdt.c | 2 +- trunk/drivers/watchdog/s3c2410_wdt.c | 148 +-- trunk/drivers/watchdog/sa1100_wdt.c | 2 +- trunk/drivers/watchdog/sc1200wdt.c | 205 ++-- trunk/drivers/watchdog/wdt.c | 176 ++-- trunk/drivers/watchdog/wdt285.c | 2 +- trunk/drivers/watchdog/wdt_pci.c | 301 +++--- trunk/firmware/ihex2fw.c | 6 +- trunk/fs/afs/write.c | 2 +- trunk/fs/buffer.c | 4 +- trunk/fs/cifs/file.c | 2 +- trunk/fs/ext4/acl.c | 188 ++-- trunk/fs/ext4/balloc.c | 11 +- trunk/fs/ext4/ext4.h | 1 - trunk/fs/ext4/extents.c | 55 +- trunk/fs/ext4/ialloc.c | 58 +- trunk/fs/ext4/inode.c | 164 ++- trunk/fs/ext4/mballoc.c | 254 ++++- trunk/fs/ext4/mballoc.h | 10 +- trunk/fs/ext4/resize.c | 79 +- trunk/fs/ext4/super.c | 316 +++--- trunk/fs/ext4/xattr.c | 2 +- trunk/fs/fat/file.c | 6 +- trunk/fs/jbd/commit.c | 6 +- trunk/fs/jbd2/commit.c | 26 +- trunk/fs/jbd2/journal.c | 1 - trunk/fs/nfs/nfsroot.c | 2 +- trunk/fs/ntfs/aops.c | 2 +- trunk/fs/ntfs/compress.c | 2 +- trunk/fs/ntfs/mft.c | 4 +- trunk/fs/omfs/inode.c | 3 +- trunk/fs/proc/base.c | 11 +- trunk/fs/reiserfs/inode.c | 2 +- trunk/fs/reiserfs/journal.c | 6 +- trunk/fs/splice.c | 2 +- trunk/fs/ufs/super.c | 2 +- trunk/fs/xfs/linux-2.6/xfs_aops.c | 6 +- trunk/include/asm-arm/arch-aaec2000/io.h | 2 +- trunk/include/asm-arm/arch-at91/cpu.h | 2 +- trunk/include/asm-arm/arch-at91/debug-macro.S | 2 +- trunk/include/asm-arm/arch-at91/entry-macro.S | 2 +- trunk/include/asm-arm/arch-at91/memory.h | 2 +- trunk/include/asm-arm/arch-at91/system.h | 2 +- trunk/include/asm-arm/arch-at91/timex.h | 2 +- .../include/asm-arm/arch-cl7500/entry-macro.S | 2 +- trunk/include/asm-arm/arch-cl7500/io.h | 2 +- .../asm-arm/arch-clps711x/entry-macro.S | 2 +- trunk/include/asm-arm/arch-clps711x/io.h | 2 +- trunk/include/asm-arm/arch-clps711x/system.h | 2 +- .../asm-arm/arch-clps711x/uncompress.h | 2 +- trunk/include/asm-arm/arch-davinci/gpio.h | 2 +- trunk/include/asm-arm/arch-davinci/system.h | 2 +- .../asm-arm/arch-ebsa285/entry-macro.S | 2 +- trunk/include/asm-arm/arch-ebsa285/io.h | 2 +- trunk/include/asm-arm/arch-ebsa285/system.h | 2 +- trunk/include/asm-arm/arch-ep93xx/hardware.h | 4 + trunk/include/asm-arm/arch-ep93xx/system.h | 2 +- trunk/include/asm-arm/arch-h720x/io.h | 2 +- trunk/include/asm-arm/arch-h720x/system.h | 2 +- trunk/include/asm-arm/arch-h720x/uncompress.h | 2 +- trunk/include/asm-arm/arch-imx/entry-macro.S | 2 +- trunk/include/asm-arm/arch-imx/io.h | 2 +- trunk/include/asm-arm/arch-imx/irqs.h | 2 +- .../asm-arm/arch-integrator/entry-macro.S | 2 +- trunk/include/asm-arm/arch-iop13xx/adma.h | 2 +- trunk/include/asm-arm/arch-iop13xx/timex.h | 2 +- .../include/asm-arm/arch-iop13xx/uncompress.h | 2 +- trunk/include/asm-arm/arch-iop32x/io.h | 2 +- trunk/include/asm-arm/arch-iop32x/memory.h | 2 +- trunk/include/asm-arm/arch-iop32x/timex.h | 2 +- .../include/asm-arm/arch-iop32x/uncompress.h | 2 +- trunk/include/asm-arm/arch-iop33x/io.h | 2 +- trunk/include/asm-arm/arch-iop33x/memory.h | 2 +- trunk/include/asm-arm/arch-iop33x/timex.h | 2 +- .../include/asm-arm/arch-iop33x/uncompress.h | 2 +- trunk/include/asm-arm/arch-ixp2000/io.h | 2 +- trunk/include/asm-arm/arch-ixp2000/system.h | 2 +- trunk/include/asm-arm/arch-ixp23xx/memory.h | 3 +- trunk/include/asm-arm/arch-ixp23xx/system.h | 2 +- trunk/include/asm-arm/arch-ixp4xx/avila.h | 2 +- trunk/include/asm-arm/arch-ixp4xx/coyote.h | 2 +- trunk/include/asm-arm/arch-ixp4xx/dma.h | 2 +- trunk/include/asm-arm/arch-ixp4xx/dsmg600.h | 2 +- .../include/asm-arm/arch-ixp4xx/entry-macro.S | 2 +- trunk/include/asm-arm/arch-ixp4xx/fsg.h | 2 +- trunk/include/asm-arm/arch-ixp4xx/gpio.h | 2 +- trunk/include/asm-arm/arch-ixp4xx/gtwx5715.h | 2 +- trunk/include/asm-arm/arch-ixp4xx/io.h | 2 +- trunk/include/asm-arm/arch-ixp4xx/ixdp425.h | 2 +- trunk/include/asm-arm/arch-ixp4xx/nas100d.h | 2 +- trunk/include/asm-arm/arch-ixp4xx/nslu2.h | 2 +- trunk/include/asm-arm/arch-ixp4xx/platform.h | 2 +- trunk/include/asm-arm/arch-ixp4xx/prpmc1100.h | 2 +- trunk/include/asm-arm/arch-ixp4xx/system.h | 2 +- trunk/include/asm-arm/arch-ixp4xx/timex.h | 2 +- .../include/asm-arm/arch-ks8695/debug-macro.S | 2 +- .../include/asm-arm/arch-ks8695/entry-macro.S | 2 +- trunk/include/asm-arm/arch-ks8695/memory.h | 2 +- trunk/include/asm-arm/arch-l7200/aux_reg.h | 2 +- .../include/asm-arm/arch-l7200/entry-macro.S | 2 +- trunk/include/asm-arm/arch-l7200/gp_timers.h | 2 +- trunk/include/asm-arm/arch-l7200/io.h | 2 +- trunk/include/asm-arm/arch-l7200/system.h | 2 +- trunk/include/asm-arm/arch-l7200/uncompress.h | 2 +- .../asm-arm/arch-lh7a40x/entry-macro.S | 2 +- trunk/include/asm-arm/arch-lh7a40x/io.h | 2 +- trunk/include/asm-arm/arch-msm/debug-macro.S | 2 +- trunk/include/asm-arm/arch-msm/system.h | 2 +- trunk/include/asm-arm/arch-mxc/gpio.h | 2 +- trunk/include/asm-arm/arch-mxc/irqs.h | 2 +- trunk/include/asm-arm/arch-mxc/memory.h | 2 +- trunk/include/asm-arm/arch-mxc/mxc_timer.h | 2 +- trunk/include/asm-arm/arch-mxc/timex.h | 2 +- trunk/include/asm-arm/arch-mxc/uncompress.h | 2 +- trunk/include/asm-arm/arch-netx/entry-macro.S | 2 +- trunk/include/asm-arm/arch-netx/system.h | 2 +- .../include/asm-arm/arch-ns9xxx/debug-macro.S | 4 +- .../include/asm-arm/arch-ns9xxx/entry-macro.S | 4 +- trunk/include/asm-arm/arch-ns9xxx/processor.h | 2 +- trunk/include/asm-arm/arch-ns9xxx/regs-bbu.h | 2 +- .../arch-ns9xxx/regs-board-a9m9750dev.h | 2 +- trunk/include/asm-arm/arch-ns9xxx/regs-mem.h | 2 +- .../asm-arm/arch-ns9xxx/regs-sys-common.h | 2 +- .../asm-arm/arch-ns9xxx/regs-sys-ns9360.h | 2 +- trunk/include/asm-arm/arch-ns9xxx/system.h | 4 +- trunk/include/asm-arm/arch-omap/board.h | 2 +- trunk/include/asm-arm/arch-omap/entry-macro.S | 2 +- trunk/include/asm-arm/arch-omap/io.h | 2 +- trunk/include/asm-arm/arch-omap/irqs.h | 2 +- trunk/include/asm-arm/arch-omap/mcbsp.h | 2 +- trunk/include/asm-arm/arch-omap/mtd-xip.h | 2 +- trunk/include/asm-arm/arch-omap/system.h | 2 +- trunk/include/asm-arm/arch-pnx4008/system.h | 2 +- trunk/include/asm-arm/arch-pnx4008/timex.h | 2 +- trunk/include/asm-arm/arch-pxa/entry-macro.S | 2 +- trunk/include/asm-arm/arch-pxa/gpio.h | 2 +- trunk/include/asm-arm/arch-pxa/io.h | 2 +- .../asm-arm/arch-realview/entry-macro.S | 2 +- trunk/include/asm-arm/arch-realview/system.h | 2 +- .../asm-arm/arch-realview/uncompress.h | 2 +- trunk/include/asm-arm/arch-rpc/entry-macro.S | 2 +- trunk/include/asm-arm/arch-rpc/io.h | 2 +- trunk/include/asm-arm/arch-rpc/system.h | 2 +- trunk/include/asm-arm/arch-rpc/uncompress.h | 2 +- trunk/include/asm-arm/arch-s3c2410/dma.h | 2 +- .../asm-arm/arch-s3c2410/entry-macro.S | 2 +- trunk/include/asm-arm/arch-s3c2410/hardware.h | 4 - trunk/include/asm-arm/arch-s3c2410/io.h | 2 +- .../asm-arm/arch-s3c2410/system-reset.h | 2 +- trunk/include/asm-arm/arch-s3c2410/system.h | 2 +- trunk/include/asm-arm/arch-sa1100/badge4.h | 2 +- .../include/asm-arm/arch-sa1100/debug-macro.S | 2 +- trunk/include/asm-arm/arch-sa1100/gpio.h | 2 +- trunk/include/asm-arm/arch-sa1100/ide.h | 2 +- trunk/include/asm-arm/arch-sa1100/system.h | 2 +- trunk/include/asm-arm/arch-shark/io.h | 2 +- .../asm-arm/arch-versatile/entry-macro.S | 2 +- trunk/include/asm-arm/arch-versatile/system.h | 2 +- trunk/include/asm-arm/hardware.h | 18 - trunk/include/asm-arm/hw_irq.h | 9 - trunk/include/asm-m68k/contregs.h | 51 +- trunk/include/asm-m68k/fbio.h | 331 ++++++- trunk/include/asm-m68k/idprom.h | 21 +- trunk/include/linux/buffer_head.h | 8 +- trunk/include/linux/ide.h | 40 +- trunk/include/linux/ieee80211.h | 13 + trunk/include/linux/ihex.h | 2 +- trunk/include/linux/interrupt.h | 29 - trunk/include/linux/kexec.h | 4 +- trunk/include/linux/mISDNif.h | 32 +- trunk/include/linux/maple.h | 8 +- trunk/include/linux/netdevice.h | 4 +- trunk/include/linux/page-flags.h | 2 +- trunk/include/linux/pagemap.h | 67 +- trunk/include/linux/parser.h | 2 +- trunk/include/linux/pm_qos_params.h | 2 +- trunk/include/linux/spi/orion_spi.h | 17 + trunk/include/linux/tracehook.h | 5 +- trunk/include/linux/vt_kern.h | 1 + trunk/include/net/dst.h | 12 +- trunk/include/net/flow.h | 1 - trunk/include/net/mac80211.h | 13 +- trunk/include/net/sch_generic.h | 26 +- trunk/include/net/sctp/structs.h | 3 +- trunk/include/video/radeon.h | 5 +- trunk/init/Kconfig | 9 +- trunk/init/main.c | 1 - trunk/kernel/auditsc.c | 7 + trunk/kernel/dma-coherent.c | 5 +- trunk/kernel/irq/manage.c | 3 +- trunk/kernel/pm_qos_params.c | 16 +- trunk/kernel/relay.c | 12 +- trunk/kernel/sched.c | 22 +- trunk/kernel/semaphore.c | 4 +- trunk/mm/filemap.c | 12 +- trunk/mm/memory.c | 18 +- trunk/mm/migrate.c | 4 +- trunk/mm/mlock.c | 2 - trunk/mm/mm_init.c | 8 +- trunk/mm/mmap.c | 2 +- trunk/mm/nommu.c | 21 + trunk/mm/rmap.c | 2 +- trunk/mm/shmem.c | 4 +- trunk/mm/swap.c | 2 +- trunk/mm/swap_state.c | 8 +- trunk/mm/swapfile.c | 2 +- trunk/mm/truncate.c | 6 +- trunk/mm/vmscan.c | 4 +- trunk/net/ax25/sysctl_net_ax25.c | 14 +- trunk/net/bridge/br_netfilter.c | 2 +- trunk/net/bridge/br_stp.c | 25 +- trunk/net/core/dev.c | 32 +- trunk/net/core/neighbour.c | 13 +- trunk/net/core/pktgen.c | 10 +- trunk/net/ipv4/sysctl_net_ipv4.c | 1 + trunk/net/ipv6/ip6_output.c | 2 +- trunk/net/ipv6/ipv6_sockglue.c | 2 + trunk/net/ipv6/syncookies.c | 22 +- trunk/net/mac80211/ieee80211_i.h | 2 + trunk/net/mac80211/main.c | 5 + trunk/net/mac80211/mlme.c | 39 +- trunk/net/mac80211/tx.c | 17 +- trunk/net/mac80211/util.c | 1 + trunk/net/mac80211/wme.c | 6 +- trunk/net/rfkill/rfkill-input.c | 54 +- trunk/net/rfkill/rfkill.c | 15 +- trunk/net/sched/sch_atm.c | 14 +- trunk/net/sched/sch_cbq.c | 27 +- trunk/net/sched/sch_dsmark.c | 10 +- trunk/net/sched/sch_generic.c | 12 +- trunk/net/sched/sch_hfsc.c | 12 +- trunk/net/sched/sch_htb.c | 24 +- trunk/net/sched/sch_netem.c | 5 +- trunk/net/sched/sch_prio.c | 14 +- trunk/net/sched/sch_red.c | 2 +- trunk/net/sched/sch_sfq.c | 8 +- trunk/net/sched/sch_tbf.c | 3 +- trunk/net/sctp/ipv6.c | 8 +- trunk/net/sctp/output.c | 6 +- trunk/net/sctp/protocol.c | 9 +- trunk/scripts/Makefile.fwinst | 4 + trunk/scripts/kconfig/conf.c | 2 +- trunk/scripts/kconfig/confdata.c | 8 +- trunk/scripts/kernel-doc | 2 +- trunk/scripts/patch-kernel | 3 +- trunk/sound/arm/pxa2xx-ac97.c | 2 +- trunk/sound/arm/pxa2xx-pcm.c | 2 +- trunk/sound/arm/sa11xx-uda1341.c | 2 +- trunk/sound/core/seq/oss/seq_oss_synth.c | 3 + trunk/sound/oss/vidc.c | 2 +- trunk/sound/oss/vidc_fill.S | 2 +- trunk/sound/oss/waveartist.c | 2 +- trunk/sound/soc/at91/eti_b1_wm8731.c | 2 +- trunk/sound/soc/davinci/davinci-evm.c | 1 - trunk/sound/soc/pxa/pxa2xx-ac97.c | 2 +- trunk/sound/soc/pxa/pxa2xx-i2s.c | 2 +- trunk/sound/soc/pxa/pxa2xx-pcm.c | 2 +- trunk/sound/soc/s3c24xx/neo1973_wm8753.c | 3 +- trunk/sound/soc/s3c24xx/s3c2412-i2s.c | 2 +- trunk/sound/soc/s3c24xx/s3c2443-ac97.c | 2 +- trunk/sound/soc/s3c24xx/s3c24xx-i2s.c | 2 +- trunk/sound/soc/s3c24xx/s3c24xx-pcm.c | 2 +- 1568 files changed, 7145 insertions(+), 4971 deletions(-) create mode 100644 trunk/Documentation/DocBook/sh.tmpl delete mode 100644 trunk/Documentation/cli-sti-removal.txt rename trunk/{include/asm-arm => arch/arm/include/asm}/Kbuild (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/a.out-core.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/a.out.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/assembler.h (98%) rename trunk/{include/asm-arm => arch/arm/include/asm}/atomic.h (99%) rename trunk/{include/asm-arm => arch/arm/include/asm}/auxvec.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/bitops.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/bug.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/bugs.h (93%) rename trunk/{include/asm-arm => arch/arm/include/asm}/byteorder.h (97%) rename trunk/{include/asm-arm => arch/arm/include/asm}/cache.h (80%) rename trunk/{include/asm-arm => arch/arm/include/asm}/cacheflush.h (99%) rename trunk/{include/asm-arm => arch/arm/include/asm}/checksum.h (98%) rename trunk/{include/asm-arm => arch/arm/include/asm}/cnt32_to_63.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/cpu-multi32.h (97%) rename trunk/{include/asm-arm => arch/arm/include/asm}/cpu-single.h (97%) rename trunk/{include/asm-arm => arch/arm/include/asm}/cpu.h (93%) rename trunk/{include/asm-arm => arch/arm/include/asm}/cputime.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/current.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/delay.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/device.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/div64.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/dma-mapping.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/dma.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/domain.h (98%) rename trunk/{include/asm-arm => arch/arm/include/asm}/ecard.h (99%) rename trunk/{include/asm-arm => arch/arm/include/asm}/elf.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/emergency-restart.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/errno.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/fb.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/fcntl.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/fiq.h (96%) rename trunk/{include/asm-arm => arch/arm/include/asm}/flat.h (90%) rename trunk/{include/asm-arm => arch/arm/include/asm}/floppy.h (99%) rename trunk/{include/asm-arm => arch/arm/include/asm}/fpstate.h (97%) rename trunk/{include/asm-arm => arch/arm/include/asm}/ftrace.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/futex.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/glue.h (99%) rename trunk/{include/asm-arm => arch/arm/include/asm}/gpio.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardirq.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/arm_timer.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/arm_twd.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/cache-l2x0.h (97%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/clps7111.h (99%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/cs89712.h (97%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/debug-8250.S (93%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/debug-pl01x.S (93%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/dec21285.h (98%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/entry-macro-iomd.S (99%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/ep7211.h (96%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/ep7212.h (98%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/gic.h (96%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/icst307.h (96%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/icst525.h (96%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/ioc.h (97%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/iomd.h (99%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/iop3xx-adma.h (99%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/iop3xx-gpio.h (95%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/iop3xx.h (99%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/iop_adma.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/it8152.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/linkup-l1110.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/locomo.h (99%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/memc.h (93%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/pci_v3.h (99%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/sa1111.h (99%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/scoop.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/sharpsl_pm.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/ssp.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/uengine.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/hardware/vic.h (97%) create mode 100644 trunk/arch/arm/include/asm/hw_irq.h rename trunk/{include/asm-arm => arch/arm/include/asm}/hwcap.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/ide.h (93%) rename trunk/{include/asm-arm => arch/arm/include/asm}/io.h (99%) rename trunk/{include/asm-arm => arch/arm/include/asm}/ioctl.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/ioctls.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/ipcbuf.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/irq.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/irq_regs.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/irqflags.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/kdebug.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/kexec.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/kgdb.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/kmap_types.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/kprobes.h (98%) rename trunk/{include/asm-arm => arch/arm/include/asm}/leds.h (96%) rename trunk/{include/asm-arm => arch/arm/include/asm}/limits.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/linkage.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/local.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/locks.h (99%) rename trunk/{include/asm-arm => arch/arm/include/asm}/mach/arch.h (97%) rename trunk/{include/asm-arm => arch/arm/include/asm}/mach/dma.h (97%) rename trunk/{include/asm-arm => arch/arm/include/asm}/mach/flash.h (96%) rename trunk/{include/asm-arm => arch/arm/include/asm}/mach/irda.h (93%) rename trunk/{include/asm-arm => arch/arm/include/asm}/mach/irq.h (61%) rename trunk/{include/asm-arm => arch/arm/include/asm}/mach/map.h (96%) rename trunk/{include/asm-arm => arch/arm/include/asm}/mach/mmc.h (88%) rename trunk/{include/asm-arm => arch/arm/include/asm}/mach/pci.h (98%) rename trunk/{include/asm-arm => arch/arm/include/asm}/mach/serial_at91.h (94%) rename trunk/{include/asm-arm => arch/arm/include/asm}/mach/serial_sa1100.h (86%) rename trunk/{include/asm-arm => arch/arm/include/asm}/mach/sharpsl_param.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/mach/time.h (97%) rename trunk/{include/asm-arm => arch/arm/include/asm}/mach/udc_pxa2xx.h (95%) rename trunk/{include/asm-arm => arch/arm/include/asm}/mc146818rtc.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/memory.h (99%) rename trunk/{include/asm-arm => arch/arm/include/asm}/mman.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/mmu.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/mmu_context.h (98%) rename trunk/{include/asm-arm => arch/arm/include/asm}/mmzone.h (94%) rename trunk/{include/asm-arm => arch/arm/include/asm}/module.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/msgbuf.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/mtd-xip.h (95%) rename trunk/{include/asm-arm => arch/arm/include/asm}/mutex.h (98%) rename trunk/{include/asm-arm => arch/arm/include/asm}/nwflash.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/page-nommu.h (96%) rename trunk/{include/asm-arm => arch/arm/include/asm}/page.h (99%) rename trunk/{include/asm-arm => arch/arm/include/asm}/param.h (95%) rename trunk/{include/asm-arm => arch/arm/include/asm}/parport.h (86%) rename trunk/{include/asm-arm => arch/arm/include/asm}/pci.h (97%) rename trunk/{include/asm-arm => arch/arm/include/asm}/percpu.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/pgalloc.h (98%) rename trunk/{include/asm-arm => arch/arm/include/asm}/pgtable-hwdef.h (98%) rename trunk/{include/asm-arm => arch/arm/include/asm}/pgtable-nommu.h (98%) rename trunk/{include/asm-arm => arch/arm/include/asm}/pgtable.h (99%) rename trunk/{include/asm-arm => arch/arm/include/asm}/poll.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/posix_types.h (98%) rename trunk/{include/asm-arm => arch/arm/include/asm}/proc-fns.h (99%) rename trunk/{include/asm-arm => arch/arm/include/asm}/processor.h (98%) rename trunk/{include/asm-arm => arch/arm/include/asm}/procinfo.h (97%) rename trunk/{include/asm-arm => arch/arm/include/asm}/ptrace.h (99%) rename trunk/{include/asm-arm => arch/arm/include/asm}/resource.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/scatterlist.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/sections.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/segment.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/sembuf.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/serial.h (91%) rename trunk/{include/asm-arm => arch/arm/include/asm}/setup.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/shmbuf.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/shmparam.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/sigcontext.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/siginfo.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/signal.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/sizes.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/smp.h (97%) rename trunk/{include/asm-arm => arch/arm/include/asm}/socket.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/sockios.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/sparsemem.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/spinlock.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/spinlock_types.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/stat.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/statfs.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/string.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/suspend.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/system.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/termbits.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/termios.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/therm.h (88%) rename trunk/{include/asm-arm => arch/arm/include/asm}/thread_info.h (97%) rename trunk/{include/asm-arm => arch/arm/include/asm}/thread_notify.h (96%) rename trunk/{include/asm-arm => arch/arm/include/asm}/timex.h (93%) rename trunk/{include/asm-arm => arch/arm/include/asm}/tlb.h (98%) rename trunk/{include/asm-arm => arch/arm/include/asm}/tlbflush.h (99%) rename trunk/{include/asm-arm => arch/arm/include/asm}/topology.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/traps.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/types.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/uaccess.h (99%) rename trunk/{include/asm-arm => arch/arm/include/asm}/ucontext.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/unaligned.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/unistd.h (99%) rename trunk/{include/asm-arm => arch/arm/include/asm}/user.h (100%) rename trunk/{include/asm-arm => arch/arm/include/asm}/vfp.h (98%) rename trunk/{include/asm-arm => arch/arm/include/asm}/vfpmacros.h (97%) rename trunk/{include/asm-arm => arch/arm/include/asm}/vga.h (88%) rename trunk/{include/asm-arm => arch/arm/include/asm}/xor.h (99%) create mode 100644 trunk/arch/arm/mm/cache-xsc3l2.c rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/8253pit.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/8xx_immap.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/Kbuild (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/a.out.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/abs_addr.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/agp.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/asm-compat.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/atomic.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/auxvec.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/backlight.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/bitops.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/bootx.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/btext.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/bug.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/bugs.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/byteorder.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/cache.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/cacheflush.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/cell-pmu.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/cell-regs.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/checksum.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/clk_interface.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/code-patching.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/compat.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/cpm.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/cpm1.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/cpm2.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/cputable.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/cputhreads.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/cputime.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/current.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/dbdma.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/dcr-generic.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/dcr-mmio.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/dcr-native.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/dcr-regs.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/dcr.h (94%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/delay.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/device.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/div64.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/dma-mapping.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/dma.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/edac.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/eeh.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/eeh_event.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/elf.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/emergency-restart.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/errno.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/exception.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/fb.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/fcntl.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/feature-fixups.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/firmware.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/fixmap.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/floppy.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/fs_pd.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/fsl_gtm.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/fsl_lbc.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/ftrace.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/futex.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/gpio.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/grackle.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/hardirq.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/heathrow.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/highmem.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/hugetlb.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/hvcall.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/hvconsole.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/hvcserver.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/hw_irq.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/hydra.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/i8259.h (71%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/ibmebus.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/ide.h (98%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/immap_86xx.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/immap_cpm2.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/immap_qe.h (99%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/io-defs.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/io.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/ioctl.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/ioctls.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/iommu.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/ipcbuf.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/ipic.h (93%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/irq.h (58%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/irq_regs.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/irqflags.h (93%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/iseries/alpaca.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_call.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_call_event.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_call_sc.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_call_xm.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_lp_config.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_lp_event.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_types.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/iseries/iommu.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/iseries/it_lp_queue.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/iseries/lpar_map.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/iseries/mf.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/iseries/vio.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/kdebug.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/kdump.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/kexec.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/keylargo.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/kgdb.h (98%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/kmap_types.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/kprobes.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/kvm.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/kvm_asm.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/kvm_host.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/kvm_para.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/kvm_ppc.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/libata-portmap.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/linkage.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/lmb.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/local.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/lppaca.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/lv1call.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/machdep.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/macio.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/mc146818rtc.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/mediabay.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/mman.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/mmu-40x.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/mmu-44x.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/mmu-8xx.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/mmu-fsl-booke.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/mmu-hash32.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/mmu-hash64.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/mmu.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/mmu_context.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/mmzone.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/module.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/mpc512x.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/mpc52xx.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/mpc52xx_psc.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/mpc6xx.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/mpc8260.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/mpc86xx.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/mpc8xx.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/mpic.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/msgbuf.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/mutex.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/nvram.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/of_device.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/of_platform.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/ohare.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/oprofile_impl.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/pSeries_reconfig.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/paca.h (99%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/page.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/page_32.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/page_64.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/param.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/parport.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/pasemi_dma.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/pci-bridge.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/pci.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/percpu.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/pgalloc-32.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/pgalloc-64.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/pgalloc.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/pgtable-4k.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/pgtable-64k.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/pgtable-ppc32.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/pgtable-ppc64.h (99%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/pgtable.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/phyp_dump.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/pmac_feature.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/pmac_low_i2c.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/pmac_pfunc.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/pmc.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/pmi.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/poll.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/posix_types.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/ppc-pci.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/ppc4xx.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/ppc_asm.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/processor.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/prom.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/ps3.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/ps3av.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/ps3fb.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/ps3stor.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/ptrace.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/qe.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/qe_ic.h (99%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/reg.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/reg_8xx.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/reg_booke.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/reg_fsl_emb.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/resource.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/rheap.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/rio.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/rtas.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/rtc.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/rwsem.h (96%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/scatterlist.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/seccomp.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/sections.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/sembuf.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/serial.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/setjmp.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/setup.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/shmbuf.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/shmparam.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/sigcontext.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/siginfo.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/signal.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/smp.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/smu.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/socket.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/sockios.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/sparsemem.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/spinlock.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/spinlock_types.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/spu.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/spu_csa.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/spu_info.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/spu_priv1.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/sstep.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/stat.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/statfs.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/string.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/suspend.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/synch.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/syscall.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/syscalls.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/systbl.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/system.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/tce.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/termbits.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/termios.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/thread_info.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/time.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/timex.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/tlb.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/tlbflush.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/topology.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/tsi108.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/tsi108_irq.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/tsi108_pci.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/types.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/uaccess.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/ucc.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/ucc_fast.h (99%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/ucc_slow.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/ucontext.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/udbg.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/uic.h (95%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/unaligned.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/uninorth.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/unistd.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/user.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/vdso.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/vdso_datapage.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/vga.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/vio.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/xilinx_intc.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/xmon.h (100%) rename trunk/{include/asm-powerpc => arch/powerpc/include/asm}/xor.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/Kbuild (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/airq.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/appldata.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/atomic.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/auxvec.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/bitops.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/bug.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/bugs.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/byteorder.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/cache.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/cacheflush.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/ccwdev.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/ccwgroup.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/checksum.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/chpid.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/chsc.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/cio.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/cmb.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/compat.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/cpcmd.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/cpu.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/cputime.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/current.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/dasd.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/debug.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/delay.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/device.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/diag.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/div64.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/dma.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/ebcdic.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/elf.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/emergency-restart.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/errno.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/etr.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/extmem.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/fb.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/fcntl.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/fcx.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/futex.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/hardirq.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/hugetlb.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/idals.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/io.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/ioctl.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/ioctls.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/ipcbuf.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/ipl.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/irq.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/irq_regs.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/irqflags.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/isc.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/itcw.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/kdebug.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/kexec.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/kmap_types.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/kprobes.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/kvm.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/kvm_host.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/kvm_para.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/kvm_virtio.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/linkage.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/local.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/lowcore.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/mathemu.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/mman.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/mmu.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/mmu_context.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/module.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/monwriter.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/msgbuf.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/mutex.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/page.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/param.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/pci.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/percpu.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/pgalloc.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/pgtable.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/poll.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/posix_types.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/processor.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/ptrace.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/qdio.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/qeth.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/reset.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/resource.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/rwsem.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/s390_ext.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/s390_rdev.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/scatterlist.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/schid.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/sclp.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/sections.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/segment.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/sembuf.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/setup.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/sfp-machine.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/sfp-util.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/shmbuf.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/shmparam.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/sigcontext.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/siginfo.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/signal.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/sigp.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/smp.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/socket.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/sockios.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/sparsemem.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/spinlock.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/spinlock_types.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/stat.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/statfs.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/string.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/suspend.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/sysinfo.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/system.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/tape390.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/termbits.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/termios.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/thread_info.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/timer.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/timex.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/tlb.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/tlbflush.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/todclk.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/topology.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/types.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/uaccess.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/ucontext.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/unaligned.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/unistd.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/user.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/vtoc.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/xor.h (100%) rename trunk/{include/asm-s390 => arch/s390/include/asm}/zcrypt.h (100%) delete mode 100644 trunk/arch/sh/include/asm/a.out.h create mode 100644 trunk/arch/sh/include/asm/seccomp.h create mode 100644 trunk/arch/sh/include/cpu-sh2a/cpu/addrspace.h create mode 100644 trunk/arch/sh/include/cpu-sh2a/cpu/cacheflush.h create mode 100644 trunk/arch/sh/mm/cache-sh2a.c delete mode 100644 trunk/arch/sparc/include/asm/of_platform_32.h delete mode 100644 trunk/arch/sparc/include/asm/of_platform_64.h rename trunk/drivers/net/wireless/iwlwifi/{iwl-4965-rs.c => iwl-agn-rs.c} (89%) rename trunk/drivers/net/wireless/iwlwifi/{iwl-4965-rs.h => iwl-agn-rs.h} (93%) rename trunk/drivers/net/wireless/iwlwifi/{iwl4965-base.c => iwl-agn.c} (96%) create mode 100644 trunk/drivers/spi/orion_spi.c create mode 100644 trunk/drivers/video/console/.gitignore delete mode 100644 trunk/include/asm-arm/hardware.h delete mode 100644 trunk/include/asm-arm/hw_irq.h create mode 100644 trunk/include/linux/spi/orion_spi.h diff --git a/[refs] b/[refs] index 27d66c0b06f8..49f047b7a71d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3663b736a5083b3bce74520b637f630f01f66a7f +refs/heads/master: a1b81a84fff05dbfef45b7012c26e1fee9973e5d diff --git a/trunk/Documentation/00-INDEX b/trunk/Documentation/00-INDEX index 6de71308a906..5b5aba404aac 100644 --- a/trunk/Documentation/00-INDEX +++ b/trunk/Documentation/00-INDEX @@ -89,8 +89,6 @@ cciss.txt - info, major/minor #'s for Compaq's SMART Array Controllers. cdrom/ - directory with information on the CD-ROM drivers that Linux has. -cli-sti-removal.txt - - cli()/sti() removal guide. computone.txt - info on Computone Intelliport II/Plus Multiport Serial Driver. connector/ diff --git a/trunk/Documentation/DocBook/Makefile b/trunk/Documentation/DocBook/Makefile index 0eb0d027eb32..1d1b34500b69 100644 --- a/trunk/Documentation/DocBook/Makefile +++ b/trunk/Documentation/DocBook/Makefile @@ -12,7 +12,7 @@ DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \ kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \ gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \ genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \ - mac80211.xml debugobjects.xml + mac80211.xml debugobjects.xml sh.xml ### # The build process is as follows (targets): diff --git a/trunk/Documentation/DocBook/s390-drivers.tmpl b/trunk/Documentation/DocBook/s390-drivers.tmpl index 4acc73240a6d..95bfc12e5439 100644 --- a/trunk/Documentation/DocBook/s390-drivers.tmpl +++ b/trunk/Documentation/DocBook/s390-drivers.tmpl @@ -100,7 +100,7 @@ the hardware structures represented here, please consult the Principles of Operation. -!Iinclude/asm-s390/cio.h +!Iarch/s390/include/asm/cio.h ccw devices @@ -114,7 +114,7 @@ ccw device structure. Device drivers must not bypass those functions or strange side effects may happen. -!Iinclude/asm-s390/ccwdev.h +!Iarch/s390/include/asm/ccwdev.h !Edrivers/s390/cio/device.c !Edrivers/s390/cio/device_ops.c @@ -125,7 +125,7 @@ measurement data which is made available by the channel subsystem for each channel attached device. -!Iinclude/asm-s390/cmb.h +!Iarch/s390/include/asm/cmb.h !Edrivers/s390/cio/cmf.c @@ -142,7 +142,7 @@ ccw group devices -!Iinclude/asm-s390/ccwgroup.h +!Iarch/s390/include/asm/ccwgroup.h !Edrivers/s390/cio/ccwgroup.c diff --git a/trunk/Documentation/DocBook/sh.tmpl b/trunk/Documentation/DocBook/sh.tmpl new file mode 100644 index 000000000000..0c3dc4c69dd1 --- /dev/null +++ b/trunk/Documentation/DocBook/sh.tmpl @@ -0,0 +1,105 @@ + + + + + + SuperH Interfaces Guide + + + + Paul + Mundt + +
+ lethal@linux-sh.org +
+ + + + + + 2008 + Paul Mundt + + + 2008 + Renesas Technology Corp. + + + + + This documentation is free software; you can redistribute + it and/or modify it under the terms of the GNU General Public + License version 2 as published by the Free Software Foundation. + + + + This program is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the implied + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + + + You should have received a copy of the GNU General Public + License along with this program; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, + MA 02111-1307 USA + + + + For more details see the file COPYING in the source + distribution of Linux. + + + + + + + + Memory Management + + SH-4 + + Store Queue API +!Earch/sh/kernel/cpu/sh4/sq.c + + + + SH-5 + + TLB Interfaces +!Iarch/sh/mm/tlb-sh5.c +!Iarch/sh/include/asm/tlb_64.h + + + + + Clock Framework Extensions +!Iarch/sh/include/asm/clock.h + + + Machine Specific Interfaces + + mach-dreamcast +!Iarch/sh/boards/mach-dreamcast/rtc.c + + + mach-x3proto +!Earch/sh/boards/mach-x3proto/ilsel.c + + + + Busses + + SuperHyway +!Edrivers/sh/superhyway/superhyway.c + + + + Maple +!Edrivers/sh/maple/maple.c + + + diff --git a/trunk/Documentation/cli-sti-removal.txt b/trunk/Documentation/cli-sti-removal.txt deleted file mode 100644 index 60932b02fcb3..000000000000 --- a/trunk/Documentation/cli-sti-removal.txt +++ /dev/null @@ -1,133 +0,0 @@ - -#### cli()/sti() removal guide, started by Ingo Molnar - - -as of 2.5.28, five popular macros have been removed on SMP, and -are being phased out on UP: - - cli(), sti(), save_flags(flags), save_flags_cli(flags), restore_flags(flags) - -until now it was possible to protect driver code against interrupt -handlers via a cli(), but from now on other, more lightweight methods -have to be used for synchronization, such as spinlocks or semaphores. - -for example, driver code that used to do something like: - - struct driver_data; - - irq_handler (...) - { - .... - driver_data.finish = 1; - driver_data.new_work = 0; - .... - } - - ... - - ioctl_func (...) - { - ... - cli(); - ... - driver_data.finish = 0; - driver_data.new_work = 2; - ... - sti(); - ... - } - -was SMP-correct because the cli() function ensured that no -interrupt handler (amongst them the above irq_handler()) function -would execute while the cli()-ed section is executing. - -but from now on a more direct method of locking has to be used: - - DEFINE_SPINLOCK(driver_lock); - struct driver_data; - - irq_handler (...) - { - unsigned long flags; - .... - spin_lock_irqsave(&driver_lock, flags); - .... - driver_data.finish = 1; - driver_data.new_work = 0; - .... - spin_unlock_irqrestore(&driver_lock, flags); - .... - } - - ... - - ioctl_func (...) - { - ... - spin_lock_irq(&driver_lock); - ... - driver_data.finish = 0; - driver_data.new_work = 2; - ... - spin_unlock_irq(&driver_lock); - ... - } - -the above code has a number of advantages: - -- the locking relation is easier to understand - actual lock usage - pinpoints the critical sections. cli() usage is too opaque. - Easier to understand means it's easier to debug. - -- it's faster, because spinlocks are faster to acquire than the - potentially heavily-used IRQ lock. Furthermore, your driver does - not have to wait eg. for a big heavy SCSI interrupt to finish, - because the driver_lock spinlock is only used by your driver. - cli() on the other hand was used by many drivers, and extended - the critical section to the whole IRQ handler function - creating - serious lock contention. - - -to make the transition easier, we've still kept the cli(), sti(), -save_flags(), save_flags_cli() and restore_flags() macros defined -on UP systems - but their usage will be phased out until 2.6 is -released. - -drivers that want to disable local interrupts (interrupts on the -current CPU), can use the following five macros: - - local_irq_disable(), local_irq_enable(), local_save_flags(flags), - local_irq_save(flags), local_irq_restore(flags) - -but beware, their meaning and semantics are much simpler, far from -that of the old cli(), sti(), save_flags(flags) and restore_flags(flags) -SMP meaning: - - local_irq_disable() => turn local IRQs off - - local_irq_enable() => turn local IRQs on - - local_save_flags(flags) => save the current IRQ state into flags. The - state can be on or off. (on some - architectures there's even more bits in it.) - - local_irq_save(flags) => save the current IRQ state into flags and - disable interrupts. - - local_irq_restore(flags) => restore the IRQ state from flags. - -(local_irq_save can save both irqs on and irqs off state, and -local_irq_restore can restore into both irqs on and irqs off state.) - -another related change is that synchronize_irq() now takes a parameter: -synchronize_irq(irq). This change too has the purpose of making SMP -synchronization more lightweight - this way you can wait for your own -interrupt handler to finish, no need to wait for other IRQ sources. - - -why were these changes done? The main reason was the architectural burden -of maintaining the cli()/sti() interface - it became a real problem. The -new interrupt system is much more streamlined, easier to understand, debug, -and it's also a bit faster - the same happened to it that will happen to -cli()/sti() using drivers once they convert to spinlocks :-) - diff --git a/trunk/Documentation/power/pm_qos_interface.txt b/trunk/Documentation/power/pm_qos_interface.txt index 49adb1a33514..c40866e8b957 100644 --- a/trunk/Documentation/power/pm_qos_interface.txt +++ b/trunk/Documentation/power/pm_qos_interface.txt @@ -1,4 +1,4 @@ -PM quality of Service interface. +PM Quality Of Service Interface. This interface provides a kernel and user mode interface for registering performance expectations by drivers, subsystems and user space applications on @@ -7,6 +7,11 @@ one of the parameters. Currently we have {cpu_dma_latency, network_latency, network_throughput} as the initial set of pm_qos parameters. +Each parameters have defined units: + * latency: usec + * timeout: usec + * throughput: kbs (kilo bit / sec) + The infrastructure exposes multiple misc device nodes one per implemented parameter. The set of parameters implement is defined by pm_qos_power_init() and pm_qos_params.h. This is done because having the available parameters diff --git a/trunk/Documentation/powerpc/booting-without-of.txt b/trunk/Documentation/powerpc/booting-without-of.txt index 928a79ceb7aa..de4063cb4fdc 100644 --- a/trunk/Documentation/powerpc/booting-without-of.txt +++ b/trunk/Documentation/powerpc/booting-without-of.txt @@ -278,7 +278,7 @@ it with special cases. a 64-bit platform. d) request and get assigned a platform number (see PLATFORM_* - constants in include/asm-powerpc/processor.h + constants in arch/powerpc/include/asm/processor.h 32-bit embedded kernels: @@ -340,7 +340,7 @@ the block to RAM before passing it to the kernel. --------- The kernel is entered with r3 pointing to an area of memory that is - roughly described in include/asm-powerpc/prom.h by the structure + roughly described in arch/powerpc/include/asm/prom.h by the structure boot_param_header: struct boot_param_header { diff --git a/trunk/Documentation/powerpc/eeh-pci-error-recovery.txt b/trunk/Documentation/powerpc/eeh-pci-error-recovery.txt index df7afe43d462..9d4e33df624c 100644 --- a/trunk/Documentation/powerpc/eeh-pci-error-recovery.txt +++ b/trunk/Documentation/powerpc/eeh-pci-error-recovery.txt @@ -133,7 +133,7 @@ error. Given an arbitrary address, the routine pci_get_device_by_addr() will find the pci device associated with that address (if any). -The default include/asm-powerpc/io.h macros readb(), inb(), insb(), +The default arch/powerpc/include/asm/io.h macros readb(), inb(), insb(), etc. include a check to see if the i/o read returned all-0xff's. If so, these make a call to eeh_dn_check_failure(), which in turn asks the firmware if the all-ff's value is the sign of a true EEH diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 5e6d6ab82433..8223a521d7c3 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -502,6 +502,12 @@ L: openezx-devel@lists.openezx.org (subscribers-only) W: http://www.openezx.org/ S: Maintained +ARM/FREESCALE IMX / MXC ARM ARCHITECTURE +P: Sascha Hauer +M: kernel@pengutronix.de +L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) +S: Maintained + ARM/GLOMATION GESBC9312SX MACHINE SUPPORT P: Lennert Buytenhek M: kernel@wantstofly.org diff --git a/trunk/Makefile b/trunk/Makefile index f156f40d6334..f3e206509ee1 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 27 -EXTRAVERSION = -rc1 +EXTRAVERSION = -rc2 NAME = Rotary Wombat # *DOCUMENTATION* @@ -929,10 +929,10 @@ ifneq ($(KBUILD_SRC),) echo " in the '$(srctree)' directory.";\ /bin/false; \ fi; - $(Q)if [ ! -d include2 ]; then mkdir -p include2; fi; - $(Q)if [ -e $(srctree)/include/asm-$(SRCARCH)/errno.h ]; then \ + $(Q)if [ ! -d include2 ]; then \ + mkdir -p include2; \ ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \ - fi + fi endif # prepare2 creates a makefile if using a separate output directory @@ -1492,7 +1492,7 @@ quiet_cmd_cscope-file = FILELST cscope.files cmd_cscope-file = (echo \-k; echo \-q; $(all-sources)) > cscope.files quiet_cmd_cscope = MAKE cscope.out - cmd_cscope = cscope -b + cmd_cscope = cscope -b -f cscope.out cscope: FORCE $(call cmd,cscope-file) diff --git a/trunk/arch/arm/Makefile b/trunk/arch/arm/Makefile index 2f0747744236..359d224c8c3e 100644 --- a/trunk/arch/arm/Makefile +++ b/trunk/arch/arm/Makefile @@ -114,13 +114,16 @@ endif machine-$(CONFIG_ARCH_IOP32X) := iop32x machine-$(CONFIG_ARCH_IOP33X) := iop33x machine-$(CONFIG_ARCH_IOP13XX) := iop13xx + plat-$(CONFIG_PLAT_IOP) := iop machine-$(CONFIG_ARCH_IXP4XX) := ixp4xx machine-$(CONFIG_ARCH_IXP2000) := ixp2000 machine-$(CONFIG_ARCH_IXP23XX) := ixp23xx machine-$(CONFIG_ARCH_OMAP1) := omap1 machine-$(CONFIG_ARCH_OMAP2) := omap2 incdir-$(CONFIG_ARCH_OMAP) := omap - machine-$(CONFIG_ARCH_S3C2410) := s3c2410 + plat-$(CONFIG_ARCH_OMAP) := omap + machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443 + plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x machine-$(CONFIG_ARCH_VERSATILE) := versatile machine-$(CONFIG_ARCH_IMX) := imx @@ -136,9 +139,11 @@ endif machine-$(CONFIG_ARCH_KIRKWOOD) := kirkwood machine-$(CONFIG_ARCH_KS8695) := ks8695 incdir-$(CONFIG_ARCH_MXC) := mxc + plat-$(CONFIG_ARCH_MXC) := mxc machine-$(CONFIG_ARCH_MX2) := mx2 machine-$(CONFIG_ARCH_MX3) := mx3 machine-$(CONFIG_ARCH_ORION5X) := orion5x + plat-$(CONFIG_PLAT_ORION) := orion machine-$(CONFIG_ARCH_MSM7X00A) := msm machine-$(CONFIG_ARCH_LOKI) := loki machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 @@ -154,16 +159,26 @@ endif TEXT_OFFSET := $(textofs-y) ifeq ($(incdir-y),) -incdir-y := $(machine-y) +incdir-y := $(word 1,$(machine-y)) endif INCDIR := arch-$(incdir-y) +# The first directory contains additional information for the boot setup code ifneq ($(machine-y),) -MACHINE := arch/arm/mach-$(machine-y)/ +MACHINE := arch/arm/mach-$(word 1,$(machine-y))/ else MACHINE := endif +machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y)) +platdirs := $(patsubst %,arch/arm/plat-%/,$(plat-y)) + +ifeq ($(KBUILD_SRC),) +KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(machdirs) $(platdirs)) +else +KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs) $(platdirs)) +endif + export TEXT_OFFSET GZFLAGS MMUEXT # Do we have FASTFPE? @@ -174,23 +189,11 @@ endif # If we have a machine-specific directory, then include it in the build. core-y += arch/arm/kernel/ arch/arm/mm/ arch/arm/common/ -core-y += $(MACHINE) -core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2400/ -core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2412/ -core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2440/ -core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2442/ -core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2443/ +core-y += $(machdirs) $(platdirs) core-$(CONFIG_FPE_NWFPE) += arch/arm/nwfpe/ core-$(CONFIG_FPE_FASTFPE) += $(FASTFPE_OBJ) core-$(CONFIG_VFP) += arch/arm/vfp/ -# If we have a common platform directory, then include it in the build. -core-$(CONFIG_PLAT_IOP) += arch/arm/plat-iop/ -core-$(CONFIG_PLAT_ORION) += arch/arm/plat-orion/ -core-$(CONFIG_ARCH_OMAP) += arch/arm/plat-omap/ -core-$(CONFIG_PLAT_S3C24XX) += arch/arm/plat-s3c24xx/ -core-$(CONFIG_ARCH_MXC) += arch/arm/plat-mxc/ - drivers-$(CONFIG_OPROFILE) += arch/arm/oprofile/ libs-y := arch/arm/lib/ $(libs-y) diff --git a/trunk/arch/arm/boot/compressed/Makefile b/trunk/arch/arm/boot/compressed/Makefile index 95baac4939e0..94462a097f86 100644 --- a/trunk/arch/arm/boot/compressed/Makefile +++ b/trunk/arch/arm/boot/compressed/Makefile @@ -112,6 +112,3 @@ $(obj)/font.c: $(FONTC) $(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile .config @sed "$(SEDFLAGS)" < $< > $@ - -$(obj)/misc.o: $(obj)/misc.c include/asm/arch/uncompress.h lib/inflate.c - diff --git a/trunk/arch/arm/boot/compressed/head-xscale.S b/trunk/arch/arm/boot/compressed/head-xscale.S index dd3fbd6766e1..aa5ee49c5c5a 100644 --- a/trunk/arch/arm/boot/compressed/head-xscale.S +++ b/trunk/arch/arm/boot/compressed/head-xscale.S @@ -6,7 +6,6 @@ */ #include -#include .section ".start", "ax" diff --git a/trunk/arch/arm/common/locomo.c b/trunk/arch/arm/common/locomo.c index 85579654d3b7..1f0f0adeafb3 100644 --- a/trunk/arch/arm/common/locomo.c +++ b/trunk/arch/arm/common/locomo.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/trunk/arch/arm/common/sa1111.c b/trunk/arch/arm/common/sa1111.c index f6d3fdda7067..64c328d1627f 100644 --- a/trunk/arch/arm/common/sa1111.c +++ b/trunk/arch/arm/common/sa1111.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/trunk/arch/arm/common/sharpsl_pm.c b/trunk/arch/arm/common/sharpsl_pm.c index 8822b684d474..a0d154006889 100644 --- a/trunk/arch/arm/common/sharpsl_pm.c +++ b/trunk/arch/arm/common/sharpsl_pm.c @@ -26,8 +26,7 @@ #include #include -#include -#include +#include #include #include #include diff --git a/trunk/arch/arm/common/time-acorn.c b/trunk/arch/arm/common/time-acorn.c index d544da414731..af37bfd74f9c 100644 --- a/trunk/arch/arm/common/time-acorn.c +++ b/trunk/arch/arm/common/time-acorn.c @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/trunk/arch/arm/common/uengine.c b/trunk/arch/arm/common/uengine.c index 117cab30bd36..3e19985ddecb 100644 --- a/trunk/arch/arm/common/uengine.c +++ b/trunk/arch/arm/common/uengine.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/trunk/include/asm-arm/Kbuild b/trunk/arch/arm/include/asm/Kbuild similarity index 100% rename from trunk/include/asm-arm/Kbuild rename to trunk/arch/arm/include/asm/Kbuild diff --git a/trunk/include/asm-arm/a.out-core.h b/trunk/arch/arm/include/asm/a.out-core.h similarity index 100% rename from trunk/include/asm-arm/a.out-core.h rename to trunk/arch/arm/include/asm/a.out-core.h diff --git a/trunk/include/asm-arm/a.out.h b/trunk/arch/arm/include/asm/a.out.h similarity index 100% rename from trunk/include/asm-arm/a.out.h rename to trunk/arch/arm/include/asm/a.out.h diff --git a/trunk/include/asm-arm/assembler.h b/trunk/arch/arm/include/asm/assembler.h similarity index 98% rename from trunk/include/asm-arm/assembler.h rename to trunk/arch/arm/include/asm/assembler.h index 911393b2c6f0..6116e4893c0a 100644 --- a/trunk/include/asm-arm/assembler.h +++ b/trunk/arch/arm/include/asm/assembler.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/assembler.h + * arch/arm/include/asm/assembler.h * * Copyright (C) 1996-2000 Russell King * diff --git a/trunk/include/asm-arm/atomic.h b/trunk/arch/arm/include/asm/atomic.h similarity index 99% rename from trunk/include/asm-arm/atomic.h rename to trunk/arch/arm/include/asm/atomic.h index 3b59f94b5a3d..325f881ccb50 100644 --- a/trunk/include/asm-arm/atomic.h +++ b/trunk/arch/arm/include/asm/atomic.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/atomic.h + * arch/arm/include/asm/atomic.h * * Copyright (C) 1996 Russell King. * Copyright (C) 2002 Deep Blue Solutions Ltd. diff --git a/trunk/include/asm-arm/auxvec.h b/trunk/arch/arm/include/asm/auxvec.h similarity index 100% rename from trunk/include/asm-arm/auxvec.h rename to trunk/arch/arm/include/asm/auxvec.h diff --git a/trunk/include/asm-arm/bitops.h b/trunk/arch/arm/include/asm/bitops.h similarity index 100% rename from trunk/include/asm-arm/bitops.h rename to trunk/arch/arm/include/asm/bitops.h diff --git a/trunk/include/asm-arm/bug.h b/trunk/arch/arm/include/asm/bug.h similarity index 100% rename from trunk/include/asm-arm/bug.h rename to trunk/arch/arm/include/asm/bug.h diff --git a/trunk/include/asm-arm/bugs.h b/trunk/arch/arm/include/asm/bugs.h similarity index 93% rename from trunk/include/asm-arm/bugs.h rename to trunk/arch/arm/include/asm/bugs.h index ca54eb0f12d7..a97f1ea708d1 100644 --- a/trunk/include/asm-arm/bugs.h +++ b/trunk/arch/arm/include/asm/bugs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/bugs.h + * arch/arm/include/asm/bugs.h * * Copyright (C) 1995-2003 Russell King * diff --git a/trunk/include/asm-arm/byteorder.h b/trunk/arch/arm/include/asm/byteorder.h similarity index 97% rename from trunk/include/asm-arm/byteorder.h rename to trunk/arch/arm/include/asm/byteorder.h index e6f7fcdc73b0..4fbfb22f65a0 100644 --- a/trunk/include/asm-arm/byteorder.h +++ b/trunk/arch/arm/include/asm/byteorder.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/byteorder.h + * arch/arm/include/asm/byteorder.h * * ARM Endian-ness. In little endian mode, the data bus is connected such * that byte accesses appear as: diff --git a/trunk/include/asm-arm/cache.h b/trunk/arch/arm/include/asm/cache.h similarity index 80% rename from trunk/include/asm-arm/cache.h rename to trunk/arch/arm/include/asm/cache.h index 31332c8ac04e..cb7a9e97fd7e 100644 --- a/trunk/include/asm-arm/cache.h +++ b/trunk/arch/arm/include/asm/cache.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/cache.h + * arch/arm/include/asm/cache.h */ #ifndef __ASMARM_CACHE_H #define __ASMARM_CACHE_H diff --git a/trunk/include/asm-arm/cacheflush.h b/trunk/arch/arm/include/asm/cacheflush.h similarity index 99% rename from trunk/include/asm-arm/cacheflush.h rename to trunk/arch/arm/include/asm/cacheflush.h index e68a1cbcc852..9073d9c6567e 100644 --- a/trunk/include/asm-arm/cacheflush.h +++ b/trunk/arch/arm/include/asm/cacheflush.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/cacheflush.h + * arch/arm/include/asm/cacheflush.h * * Copyright (C) 1999-2002 Russell King * diff --git a/trunk/include/asm-arm/checksum.h b/trunk/arch/arm/include/asm/checksum.h similarity index 98% rename from trunk/include/asm-arm/checksum.h rename to trunk/arch/arm/include/asm/checksum.h index eaa0efd8d0d4..6dcc16430868 100644 --- a/trunk/include/asm-arm/checksum.h +++ b/trunk/arch/arm/include/asm/checksum.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/checksum.h + * arch/arm/include/asm/checksum.h * * IP checksum routines * diff --git a/trunk/include/asm-arm/cnt32_to_63.h b/trunk/arch/arm/include/asm/cnt32_to_63.h similarity index 100% rename from trunk/include/asm-arm/cnt32_to_63.h rename to trunk/arch/arm/include/asm/cnt32_to_63.h diff --git a/trunk/include/asm-arm/cpu-multi32.h b/trunk/arch/arm/include/asm/cpu-multi32.h similarity index 97% rename from trunk/include/asm-arm/cpu-multi32.h rename to trunk/arch/arm/include/asm/cpu-multi32.h index 3479de9266e5..e2b5b0b2116a 100644 --- a/trunk/include/asm-arm/cpu-multi32.h +++ b/trunk/arch/arm/include/asm/cpu-multi32.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/cpu-multi32.h + * arch/arm/include/asm/cpu-multi32.h * * Copyright (C) 2000 Russell King * diff --git a/trunk/include/asm-arm/cpu-single.h b/trunk/arch/arm/include/asm/cpu-single.h similarity index 97% rename from trunk/include/asm-arm/cpu-single.h rename to trunk/arch/arm/include/asm/cpu-single.h index 0b120ee36091..f073a6d2a406 100644 --- a/trunk/include/asm-arm/cpu-single.h +++ b/trunk/arch/arm/include/asm/cpu-single.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/cpu-single.h + * arch/arm/include/asm/cpu-single.h * * Copyright (C) 2000 Russell King * diff --git a/trunk/include/asm-arm/cpu.h b/trunk/arch/arm/include/asm/cpu.h similarity index 93% rename from trunk/include/asm-arm/cpu.h rename to trunk/arch/arm/include/asm/cpu.h index 715426b9b08e..634b2d7c612a 100644 --- a/trunk/include/asm-arm/cpu.h +++ b/trunk/arch/arm/include/asm/cpu.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/cpu.h + * arch/arm/include/asm/cpu.h * * Copyright (C) 2004-2005 ARM Ltd. * diff --git a/trunk/include/asm-arm/cputime.h b/trunk/arch/arm/include/asm/cputime.h similarity index 100% rename from trunk/include/asm-arm/cputime.h rename to trunk/arch/arm/include/asm/cputime.h diff --git a/trunk/include/asm-arm/current.h b/trunk/arch/arm/include/asm/current.h similarity index 100% rename from trunk/include/asm-arm/current.h rename to trunk/arch/arm/include/asm/current.h diff --git a/trunk/include/asm-arm/delay.h b/trunk/arch/arm/include/asm/delay.h similarity index 100% rename from trunk/include/asm-arm/delay.h rename to trunk/arch/arm/include/asm/delay.h diff --git a/trunk/include/asm-arm/device.h b/trunk/arch/arm/include/asm/device.h similarity index 100% rename from trunk/include/asm-arm/device.h rename to trunk/arch/arm/include/asm/device.h diff --git a/trunk/include/asm-arm/div64.h b/trunk/arch/arm/include/asm/div64.h similarity index 100% rename from trunk/include/asm-arm/div64.h rename to trunk/arch/arm/include/asm/div64.h diff --git a/trunk/include/asm-arm/dma-mapping.h b/trunk/arch/arm/include/asm/dma-mapping.h similarity index 100% rename from trunk/include/asm-arm/dma-mapping.h rename to trunk/arch/arm/include/asm/dma-mapping.h diff --git a/trunk/include/asm-arm/dma.h b/trunk/arch/arm/include/asm/dma.h similarity index 100% rename from trunk/include/asm-arm/dma.h rename to trunk/arch/arm/include/asm/dma.h diff --git a/trunk/include/asm-arm/domain.h b/trunk/arch/arm/include/asm/domain.h similarity index 98% rename from trunk/include/asm-arm/domain.h rename to trunk/arch/arm/include/asm/domain.h index 3c12a7625304..cc7ef4080711 100644 --- a/trunk/include/asm-arm/domain.h +++ b/trunk/arch/arm/include/asm/domain.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/domain.h + * arch/arm/include/asm/domain.h * * Copyright (C) 1999 Russell King. * diff --git a/trunk/include/asm-arm/ecard.h b/trunk/arch/arm/include/asm/ecard.h similarity index 99% rename from trunk/include/asm-arm/ecard.h rename to trunk/arch/arm/include/asm/ecard.h index 5e22881a630d..29f2610efc70 100644 --- a/trunk/include/asm-arm/ecard.h +++ b/trunk/arch/arm/include/asm/ecard.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/ecard.h + * arch/arm/include/asm/ecard.h * * definitions for expansion cards * diff --git a/trunk/include/asm-arm/elf.h b/trunk/arch/arm/include/asm/elf.h similarity index 100% rename from trunk/include/asm-arm/elf.h rename to trunk/arch/arm/include/asm/elf.h diff --git a/trunk/include/asm-arm/emergency-restart.h b/trunk/arch/arm/include/asm/emergency-restart.h similarity index 100% rename from trunk/include/asm-arm/emergency-restart.h rename to trunk/arch/arm/include/asm/emergency-restart.h diff --git a/trunk/include/asm-arm/errno.h b/trunk/arch/arm/include/asm/errno.h similarity index 100% rename from trunk/include/asm-arm/errno.h rename to trunk/arch/arm/include/asm/errno.h diff --git a/trunk/include/asm-arm/fb.h b/trunk/arch/arm/include/asm/fb.h similarity index 100% rename from trunk/include/asm-arm/fb.h rename to trunk/arch/arm/include/asm/fb.h diff --git a/trunk/include/asm-arm/fcntl.h b/trunk/arch/arm/include/asm/fcntl.h similarity index 100% rename from trunk/include/asm-arm/fcntl.h rename to trunk/arch/arm/include/asm/fcntl.h diff --git a/trunk/include/asm-arm/fiq.h b/trunk/arch/arm/include/asm/fiq.h similarity index 96% rename from trunk/include/asm-arm/fiq.h rename to trunk/arch/arm/include/asm/fiq.h index a3bad09e825c..2242ce22ec6c 100644 --- a/trunk/include/asm-arm/fiq.h +++ b/trunk/arch/arm/include/asm/fiq.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/fiq.h + * arch/arm/include/asm/fiq.h * * Support for FIQ on ARM architectures. * Written by Philip Blundell , 1998 diff --git a/trunk/include/asm-arm/flat.h b/trunk/arch/arm/include/asm/flat.h similarity index 90% rename from trunk/include/asm-arm/flat.h rename to trunk/arch/arm/include/asm/flat.h index 9918aa46d9e5..1d77e51907f6 100644 --- a/trunk/include/asm-arm/flat.h +++ b/trunk/arch/arm/include/asm/flat.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/flat.h -- uClinux flat-format executables + * arch/arm/include/asm/flat.h -- uClinux flat-format executables */ #ifndef __ARM_FLAT_H__ diff --git a/trunk/include/asm-arm/floppy.h b/trunk/arch/arm/include/asm/floppy.h similarity index 99% rename from trunk/include/asm-arm/floppy.h rename to trunk/arch/arm/include/asm/floppy.h index 41a5e9d6bb69..dce20c25ab10 100644 --- a/trunk/include/asm-arm/floppy.h +++ b/trunk/arch/arm/include/asm/floppy.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/floppy.h + * arch/arm/include/asm/floppy.h * * Copyright (C) 1996-2000 Russell King * diff --git a/trunk/include/asm-arm/fpstate.h b/trunk/arch/arm/include/asm/fpstate.h similarity index 97% rename from trunk/include/asm-arm/fpstate.h rename to trunk/arch/arm/include/asm/fpstate.h index 392eb5332323..ee5e03efc1bb 100644 --- a/trunk/include/asm-arm/fpstate.h +++ b/trunk/arch/arm/include/asm/fpstate.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/fpstate.h + * arch/arm/include/asm/fpstate.h * * Copyright (C) 1995 Russell King * diff --git a/trunk/include/asm-arm/ftrace.h b/trunk/arch/arm/include/asm/ftrace.h similarity index 100% rename from trunk/include/asm-arm/ftrace.h rename to trunk/arch/arm/include/asm/ftrace.h diff --git a/trunk/include/asm-arm/futex.h b/trunk/arch/arm/include/asm/futex.h similarity index 100% rename from trunk/include/asm-arm/futex.h rename to trunk/arch/arm/include/asm/futex.h diff --git a/trunk/include/asm-arm/glue.h b/trunk/arch/arm/include/asm/glue.h similarity index 99% rename from trunk/include/asm-arm/glue.h rename to trunk/arch/arm/include/asm/glue.h index a97a182ba287..a0e39d5d00c9 100644 --- a/trunk/include/asm-arm/glue.h +++ b/trunk/arch/arm/include/asm/glue.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/glue.h + * arch/arm/include/asm/glue.h * * Copyright (C) 1997-1999 Russell King * Copyright (C) 2000-2002 Deep Blue Solutions Ltd. diff --git a/trunk/include/asm-arm/gpio.h b/trunk/arch/arm/include/asm/gpio.h similarity index 100% rename from trunk/include/asm-arm/gpio.h rename to trunk/arch/arm/include/asm/gpio.h diff --git a/trunk/include/asm-arm/hardirq.h b/trunk/arch/arm/include/asm/hardirq.h similarity index 100% rename from trunk/include/asm-arm/hardirq.h rename to trunk/arch/arm/include/asm/hardirq.h diff --git a/trunk/include/asm-arm/hardware/arm_timer.h b/trunk/arch/arm/include/asm/hardware/arm_timer.h similarity index 100% rename from trunk/include/asm-arm/hardware/arm_timer.h rename to trunk/arch/arm/include/asm/hardware/arm_timer.h diff --git a/trunk/include/asm-arm/hardware/arm_twd.h b/trunk/arch/arm/include/asm/hardware/arm_twd.h similarity index 100% rename from trunk/include/asm-arm/hardware/arm_twd.h rename to trunk/arch/arm/include/asm/hardware/arm_twd.h diff --git a/trunk/include/asm-arm/hardware/cache-l2x0.h b/trunk/arch/arm/include/asm/hardware/cache-l2x0.h similarity index 97% rename from trunk/include/asm-arm/hardware/cache-l2x0.h rename to trunk/arch/arm/include/asm/hardware/cache-l2x0.h index 54029a740396..64f2252a25cd 100644 --- a/trunk/include/asm-arm/hardware/cache-l2x0.h +++ b/trunk/arch/arm/include/asm/hardware/cache-l2x0.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/hardware/cache-l2x0.h + * arch/arm/include/asm/hardware/cache-l2x0.h * * Copyright (C) 2007 ARM Limited * diff --git a/trunk/include/asm-arm/hardware/clps7111.h b/trunk/arch/arm/include/asm/hardware/clps7111.h similarity index 99% rename from trunk/include/asm-arm/hardware/clps7111.h rename to trunk/arch/arm/include/asm/hardware/clps7111.h index 8d3228dc1778..44477225aed6 100644 --- a/trunk/include/asm-arm/hardware/clps7111.h +++ b/trunk/arch/arm/include/asm/hardware/clps7111.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/hardware/clps7111.h + * arch/arm/include/asm/hardware/clps7111.h * * This file contains the hardware definitions of the CLPS7111 internal * registers. diff --git a/trunk/include/asm-arm/hardware/cs89712.h b/trunk/arch/arm/include/asm/hardware/cs89712.h similarity index 97% rename from trunk/include/asm-arm/hardware/cs89712.h rename to trunk/arch/arm/include/asm/hardware/cs89712.h index ad99a3e1b802..f75626933e94 100644 --- a/trunk/include/asm-arm/hardware/cs89712.h +++ b/trunk/arch/arm/include/asm/hardware/cs89712.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/hardware/cs89712.h + * arch/arm/include/asm/hardware/cs89712.h * * This file contains the hardware definitions of the CS89712 * additional internal registers. diff --git a/trunk/include/asm-arm/hardware/debug-8250.S b/trunk/arch/arm/include/asm/hardware/debug-8250.S similarity index 93% rename from trunk/include/asm-arm/hardware/debug-8250.S rename to trunk/arch/arm/include/asm/hardware/debug-8250.S index 07c97fb233fc..22c689255e6e 100644 --- a/trunk/include/asm-arm/hardware/debug-8250.S +++ b/trunk/arch/arm/include/asm/hardware/debug-8250.S @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/hardware/debug-8250.S + * arch/arm/include/asm/hardware/debug-8250.S * * Copyright (C) 1994-1999 Russell King * diff --git a/trunk/include/asm-arm/hardware/debug-pl01x.S b/trunk/arch/arm/include/asm/hardware/debug-pl01x.S similarity index 93% rename from trunk/include/asm-arm/hardware/debug-pl01x.S rename to trunk/arch/arm/include/asm/hardware/debug-pl01x.S index 23c541a9e89a..f9fd083eff63 100644 --- a/trunk/include/asm-arm/hardware/debug-pl01x.S +++ b/trunk/arch/arm/include/asm/hardware/debug-pl01x.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/hardware/debug-pl01x.S +/* arch/arm/include/asm/hardware/debug-pl01x.S * * Debugging macro include header * diff --git a/trunk/include/asm-arm/hardware/dec21285.h b/trunk/arch/arm/include/asm/hardware/dec21285.h similarity index 98% rename from trunk/include/asm-arm/hardware/dec21285.h rename to trunk/arch/arm/include/asm/hardware/dec21285.h index 546f7077be9c..cf2578ffd54d 100644 --- a/trunk/include/asm-arm/hardware/dec21285.h +++ b/trunk/arch/arm/include/asm/hardware/dec21285.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/hardware/dec21285.h + * arch/arm/include/asm/hardware/dec21285.h * * Copyright (C) 1998 Russell King * @@ -19,7 +19,7 @@ #define DC21285_PCI_MEM 0x80000000 #ifndef __ASSEMBLY__ -#include +#include #define DC21285_IO(x) ((volatile unsigned long *)(ARMCSR_BASE+(x))) #else #define DC21285_IO(x) (x) diff --git a/trunk/include/asm-arm/hardware/entry-macro-iomd.S b/trunk/arch/arm/include/asm/hardware/entry-macro-iomd.S similarity index 99% rename from trunk/include/asm-arm/hardware/entry-macro-iomd.S rename to trunk/arch/arm/include/asm/hardware/entry-macro-iomd.S index 9bb580a5b15e..e0af4983723f 100644 --- a/trunk/include/asm-arm/hardware/entry-macro-iomd.S +++ b/trunk/arch/arm/include/asm/hardware/entry-macro-iomd.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/hardware/entry-macro-iomd.S + * arch/arm/include/asm/hardware/entry-macro-iomd.S * * Low-level IRQ helper macros for IOC/IOMD based platforms * diff --git a/trunk/include/asm-arm/hardware/ep7211.h b/trunk/arch/arm/include/asm/hardware/ep7211.h similarity index 96% rename from trunk/include/asm-arm/hardware/ep7211.h rename to trunk/arch/arm/include/asm/hardware/ep7211.h index 017aa68f612d..654d5f625c49 100644 --- a/trunk/include/asm-arm/hardware/ep7211.h +++ b/trunk/arch/arm/include/asm/hardware/ep7211.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/hardware/ep7211.h + * arch/arm/include/asm/hardware/ep7211.h * * This file contains the hardware definitions of the EP7211 internal * registers. diff --git a/trunk/include/asm-arm/hardware/ep7212.h b/trunk/arch/arm/include/asm/hardware/ep7212.h similarity index 98% rename from trunk/include/asm-arm/hardware/ep7212.h rename to trunk/arch/arm/include/asm/hardware/ep7212.h index 0e952e747073..3b43bbeaf1db 100644 --- a/trunk/include/asm-arm/hardware/ep7212.h +++ b/trunk/arch/arm/include/asm/hardware/ep7212.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/hardware/ep7212.h + * arch/arm/include/asm/hardware/ep7212.h * * This file contains the hardware definitions of the EP7212 internal * registers. diff --git a/trunk/include/asm-arm/hardware/gic.h b/trunk/arch/arm/include/asm/hardware/gic.h similarity index 96% rename from trunk/include/asm-arm/hardware/gic.h rename to trunk/arch/arm/include/asm/hardware/gic.h index 966e428ad32c..4924914af188 100644 --- a/trunk/include/asm-arm/hardware/gic.h +++ b/trunk/arch/arm/include/asm/hardware/gic.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/hardware/gic.h + * arch/arm/include/asm/hardware/gic.h * * Copyright (C) 2002 ARM Limited, All Rights Reserved. * diff --git a/trunk/include/asm-arm/hardware/icst307.h b/trunk/arch/arm/include/asm/hardware/icst307.h similarity index 96% rename from trunk/include/asm-arm/hardware/icst307.h rename to trunk/arch/arm/include/asm/hardware/icst307.h index ff8618a441c0..554f128a1046 100644 --- a/trunk/include/asm-arm/hardware/icst307.h +++ b/trunk/arch/arm/include/asm/hardware/icst307.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/hardware/icst307.h + * arch/arm/include/asm/hardware/icst307.h * * Copyright (C) 2003 Deep Blue Solutions, Ltd, All Rights Reserved. * diff --git a/trunk/include/asm-arm/hardware/icst525.h b/trunk/arch/arm/include/asm/hardware/icst525.h similarity index 96% rename from trunk/include/asm-arm/hardware/icst525.h rename to trunk/arch/arm/include/asm/hardware/icst525.h index edd5a5704406..58f0dc43e2ed 100644 --- a/trunk/include/asm-arm/hardware/icst525.h +++ b/trunk/arch/arm/include/asm/hardware/icst525.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/hardware/icst525.h + * arch/arm/include/asm/hardware/icst525.h * * Copyright (C) 2003 Deep Blue Solutions, Ltd, All Rights Reserved. * diff --git a/trunk/include/asm-arm/hardware/ioc.h b/trunk/arch/arm/include/asm/hardware/ioc.h similarity index 97% rename from trunk/include/asm-arm/hardware/ioc.h rename to trunk/arch/arm/include/asm/hardware/ioc.h index b3b46ef65943..1f6b8013becb 100644 --- a/trunk/include/asm-arm/hardware/ioc.h +++ b/trunk/arch/arm/include/asm/hardware/ioc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/hardware/ioc.h + * arch/arm/include/asm/hardware/ioc.h * * Copyright (C) Russell King * diff --git a/trunk/include/asm-arm/hardware/iomd.h b/trunk/arch/arm/include/asm/hardware/iomd.h similarity index 99% rename from trunk/include/asm-arm/hardware/iomd.h rename to trunk/arch/arm/include/asm/hardware/iomd.h index 396e55ad06c6..9c5afbd71a69 100644 --- a/trunk/include/asm-arm/hardware/iomd.h +++ b/trunk/arch/arm/include/asm/hardware/iomd.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/hardware/iomd.h + * arch/arm/include/asm/hardware/iomd.h * * Copyright (C) 1999 Russell King * diff --git a/trunk/include/asm-arm/hardware/iop3xx-adma.h b/trunk/arch/arm/include/asm/hardware/iop3xx-adma.h similarity index 99% rename from trunk/include/asm-arm/hardware/iop3xx-adma.h rename to trunk/arch/arm/include/asm/hardware/iop3xx-adma.h index af64676650a2..df31b15cf6e0 100644 --- a/trunk/include/asm-arm/hardware/iop3xx-adma.h +++ b/trunk/arch/arm/include/asm/hardware/iop3xx-adma.h @@ -19,7 +19,7 @@ #define _ADMA_H #include #include -#include +#include #include /* Memory copy units */ diff --git a/trunk/include/asm-arm/hardware/iop3xx-gpio.h b/trunk/arch/arm/include/asm/hardware/iop3xx-gpio.h similarity index 95% rename from trunk/include/asm-arm/hardware/iop3xx-gpio.h rename to trunk/arch/arm/include/asm/hardware/iop3xx-gpio.h index 0c9331f9ac24..0ebc91cb42f9 100644 --- a/trunk/include/asm-arm/hardware/iop3xx-gpio.h +++ b/trunk/arch/arm/include/asm/hardware/iop3xx-gpio.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/hardware/iop3xx-gpio.h + * arch/arm/include/asm/hardware/iop3xx-gpio.h * * IOP3xx GPIO wrappers * @@ -25,7 +25,7 @@ #ifndef __ASM_ARM_HARDWARE_IOP3XX_GPIO_H #define __ASM_ARM_HARDWARE_IOP3XX_GPIO_H -#include +#include #include #define IOP3XX_N_GPIOS 8 diff --git a/trunk/include/asm-arm/hardware/iop3xx.h b/trunk/arch/arm/include/asm/hardware/iop3xx.h similarity index 99% rename from trunk/include/asm-arm/hardware/iop3xx.h rename to trunk/arch/arm/include/asm/hardware/iop3xx.h index 18f6937f5010..4b8e7f559929 100644 --- a/trunk/include/asm-arm/hardware/iop3xx.h +++ b/trunk/arch/arm/include/asm/hardware/iop3xx.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/hardware/iop3xx.h + * arch/arm/include/asm/hardware/iop3xx.h * * Intel IOP32X and IOP33X register definitions * diff --git a/trunk/include/asm-arm/hardware/iop_adma.h b/trunk/arch/arm/include/asm/hardware/iop_adma.h similarity index 100% rename from trunk/include/asm-arm/hardware/iop_adma.h rename to trunk/arch/arm/include/asm/hardware/iop_adma.h diff --git a/trunk/include/asm-arm/hardware/it8152.h b/trunk/arch/arm/include/asm/hardware/it8152.h similarity index 100% rename from trunk/include/asm-arm/hardware/it8152.h rename to trunk/arch/arm/include/asm/hardware/it8152.h diff --git a/trunk/include/asm-arm/hardware/linkup-l1110.h b/trunk/arch/arm/include/asm/hardware/linkup-l1110.h similarity index 100% rename from trunk/include/asm-arm/hardware/linkup-l1110.h rename to trunk/arch/arm/include/asm/hardware/linkup-l1110.h diff --git a/trunk/include/asm-arm/hardware/locomo.h b/trunk/arch/arm/include/asm/hardware/locomo.h similarity index 99% rename from trunk/include/asm-arm/hardware/locomo.h rename to trunk/arch/arm/include/asm/hardware/locomo.h index fb0645de6f31..954b1be991b4 100644 --- a/trunk/include/asm-arm/hardware/locomo.h +++ b/trunk/arch/arm/include/asm/hardware/locomo.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/hardware/locomo.h + * arch/arm/include/asm/hardware/locomo.h * * This file contains the definitions for the LoCoMo G/A Chip * diff --git a/trunk/include/asm-arm/hardware/memc.h b/trunk/arch/arm/include/asm/hardware/memc.h similarity index 93% rename from trunk/include/asm-arm/hardware/memc.h rename to trunk/arch/arm/include/asm/hardware/memc.h index 8aef5aa0e01b..42ba7c167d1f 100644 --- a/trunk/include/asm-arm/hardware/memc.h +++ b/trunk/arch/arm/include/asm/hardware/memc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/hardware/memc.h + * arch/arm/include/asm/hardware/memc.h * * Copyright (C) Russell King. * diff --git a/trunk/include/asm-arm/hardware/pci_v3.h b/trunk/arch/arm/include/asm/hardware/pci_v3.h similarity index 99% rename from trunk/include/asm-arm/hardware/pci_v3.h rename to trunk/arch/arm/include/asm/hardware/pci_v3.h index 4d497bdb9a97..2811c7e2cfdf 100644 --- a/trunk/include/asm-arm/hardware/pci_v3.h +++ b/trunk/arch/arm/include/asm/hardware/pci_v3.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/hardware/pci_v3.h + * arch/arm/include/asm/hardware/pci_v3.h * * Internal header file PCI V3 chip * diff --git a/trunk/include/asm-arm/hardware/sa1111.h b/trunk/arch/arm/include/asm/hardware/sa1111.h similarity index 99% rename from trunk/include/asm-arm/hardware/sa1111.h rename to trunk/arch/arm/include/asm/hardware/sa1111.h index 61b1d05c7df7..6cf98d4f7dc3 100644 --- a/trunk/include/asm-arm/hardware/sa1111.h +++ b/trunk/arch/arm/include/asm/hardware/sa1111.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/hardware/sa1111.h + * arch/arm/include/asm/hardware/sa1111.h * * Copyright (C) 2000 John G Dorsey * diff --git a/trunk/include/asm-arm/hardware/scoop.h b/trunk/arch/arm/include/asm/hardware/scoop.h similarity index 100% rename from trunk/include/asm-arm/hardware/scoop.h rename to trunk/arch/arm/include/asm/hardware/scoop.h diff --git a/trunk/include/asm-arm/hardware/sharpsl_pm.h b/trunk/arch/arm/include/asm/hardware/sharpsl_pm.h similarity index 100% rename from trunk/include/asm-arm/hardware/sharpsl_pm.h rename to trunk/arch/arm/include/asm/hardware/sharpsl_pm.h diff --git a/trunk/include/asm-arm/hardware/ssp.h b/trunk/arch/arm/include/asm/hardware/ssp.h similarity index 100% rename from trunk/include/asm-arm/hardware/ssp.h rename to trunk/arch/arm/include/asm/hardware/ssp.h diff --git a/trunk/include/asm-arm/hardware/uengine.h b/trunk/arch/arm/include/asm/hardware/uengine.h similarity index 100% rename from trunk/include/asm-arm/hardware/uengine.h rename to trunk/arch/arm/include/asm/hardware/uengine.h diff --git a/trunk/include/asm-arm/hardware/vic.h b/trunk/arch/arm/include/asm/hardware/vic.h similarity index 97% rename from trunk/include/asm-arm/hardware/vic.h rename to trunk/arch/arm/include/asm/hardware/vic.h index ed9ca3736a0b..263f2c362a30 100644 --- a/trunk/include/asm-arm/hardware/vic.h +++ b/trunk/arch/arm/include/asm/hardware/vic.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/hardware/vic.h + * arch/arm/include/asm/hardware/vic.h * * Copyright (c) ARM Limited 2003. All rights reserved. * diff --git a/trunk/arch/arm/include/asm/hw_irq.h b/trunk/arch/arm/include/asm/hw_irq.h new file mode 100644 index 000000000000..90831f6f5f5c --- /dev/null +++ b/trunk/arch/arm/include/asm/hw_irq.h @@ -0,0 +1,27 @@ +/* + * Nothing to see here yet + */ +#ifndef _ARCH_ARM_HW_IRQ_H +#define _ARCH_ARM_HW_IRQ_H + +static inline void ack_bad_irq(int irq) +{ + extern unsigned long irq_err_count; + irq_err_count++; +} + +/* + * Obsolete inline function for calling irq descriptor handlers. + */ +static inline void desc_handle_irq(unsigned int irq, struct irq_desc *desc) +{ + desc->handle_irq(irq, desc); +} + +void set_irq_flags(unsigned int irq, unsigned int flags); + +#define IRQF_VALID (1 << 0) +#define IRQF_PROBE (1 << 1) +#define IRQF_NOAUTOEN (1 << 2) + +#endif diff --git a/trunk/include/asm-arm/hwcap.h b/trunk/arch/arm/include/asm/hwcap.h similarity index 100% rename from trunk/include/asm-arm/hwcap.h rename to trunk/arch/arm/include/asm/hwcap.h diff --git a/trunk/include/asm-arm/ide.h b/trunk/arch/arm/include/asm/ide.h similarity index 93% rename from trunk/include/asm-arm/ide.h rename to trunk/arch/arm/include/asm/ide.h index a48019f99d08..b507ce8e5019 100644 --- a/trunk/include/asm-arm/ide.h +++ b/trunk/arch/arm/include/asm/ide.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/ide.h + * arch/arm/include/asm/ide.h * * Copyright (C) 1994-1996 Linus Torvalds & authors */ diff --git a/trunk/include/asm-arm/io.h b/trunk/arch/arm/include/asm/io.h similarity index 99% rename from trunk/include/asm-arm/io.h rename to trunk/arch/arm/include/asm/io.h index eebe56e74d6d..ffe07c0f46d8 100644 --- a/trunk/include/asm-arm/io.h +++ b/trunk/arch/arm/include/asm/io.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/io.h + * arch/arm/include/asm/io.h * * Copyright (C) 1996-2000 Russell King * diff --git a/trunk/include/asm-arm/ioctl.h b/trunk/arch/arm/include/asm/ioctl.h similarity index 100% rename from trunk/include/asm-arm/ioctl.h rename to trunk/arch/arm/include/asm/ioctl.h diff --git a/trunk/include/asm-arm/ioctls.h b/trunk/arch/arm/include/asm/ioctls.h similarity index 100% rename from trunk/include/asm-arm/ioctls.h rename to trunk/arch/arm/include/asm/ioctls.h diff --git a/trunk/include/asm-arm/ipcbuf.h b/trunk/arch/arm/include/asm/ipcbuf.h similarity index 100% rename from trunk/include/asm-arm/ipcbuf.h rename to trunk/arch/arm/include/asm/ipcbuf.h diff --git a/trunk/include/asm-arm/irq.h b/trunk/arch/arm/include/asm/irq.h similarity index 100% rename from trunk/include/asm-arm/irq.h rename to trunk/arch/arm/include/asm/irq.h diff --git a/trunk/include/asm-arm/irq_regs.h b/trunk/arch/arm/include/asm/irq_regs.h similarity index 100% rename from trunk/include/asm-arm/irq_regs.h rename to trunk/arch/arm/include/asm/irq_regs.h diff --git a/trunk/include/asm-arm/irqflags.h b/trunk/arch/arm/include/asm/irqflags.h similarity index 100% rename from trunk/include/asm-arm/irqflags.h rename to trunk/arch/arm/include/asm/irqflags.h diff --git a/trunk/include/asm-arm/kdebug.h b/trunk/arch/arm/include/asm/kdebug.h similarity index 100% rename from trunk/include/asm-arm/kdebug.h rename to trunk/arch/arm/include/asm/kdebug.h diff --git a/trunk/include/asm-arm/kexec.h b/trunk/arch/arm/include/asm/kexec.h similarity index 100% rename from trunk/include/asm-arm/kexec.h rename to trunk/arch/arm/include/asm/kexec.h diff --git a/trunk/include/asm-arm/kgdb.h b/trunk/arch/arm/include/asm/kgdb.h similarity index 100% rename from trunk/include/asm-arm/kgdb.h rename to trunk/arch/arm/include/asm/kgdb.h diff --git a/trunk/include/asm-arm/kmap_types.h b/trunk/arch/arm/include/asm/kmap_types.h similarity index 100% rename from trunk/include/asm-arm/kmap_types.h rename to trunk/arch/arm/include/asm/kmap_types.h diff --git a/trunk/include/asm-arm/kprobes.h b/trunk/arch/arm/include/asm/kprobes.h similarity index 98% rename from trunk/include/asm-arm/kprobes.h rename to trunk/arch/arm/include/asm/kprobes.h index b1a37876942d..a5d0d99ad387 100644 --- a/trunk/include/asm-arm/kprobes.h +++ b/trunk/arch/arm/include/asm/kprobes.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/kprobes.h + * arch/arm/include/asm/kprobes.h * * Copyright (C) 2006, 2007 Motorola Inc. * diff --git a/trunk/include/asm-arm/leds.h b/trunk/arch/arm/include/asm/leds.h similarity index 96% rename from trunk/include/asm-arm/leds.h rename to trunk/arch/arm/include/asm/leds.h index 12290ea55801..c545739f39b7 100644 --- a/trunk/include/asm-arm/leds.h +++ b/trunk/arch/arm/include/asm/leds.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/leds.h + * arch/arm/include/asm/leds.h * * Copyright (C) 1998 Russell King * diff --git a/trunk/include/asm-arm/limits.h b/trunk/arch/arm/include/asm/limits.h similarity index 100% rename from trunk/include/asm-arm/limits.h rename to trunk/arch/arm/include/asm/limits.h diff --git a/trunk/include/asm-arm/linkage.h b/trunk/arch/arm/include/asm/linkage.h similarity index 100% rename from trunk/include/asm-arm/linkage.h rename to trunk/arch/arm/include/asm/linkage.h diff --git a/trunk/include/asm-arm/local.h b/trunk/arch/arm/include/asm/local.h similarity index 100% rename from trunk/include/asm-arm/local.h rename to trunk/arch/arm/include/asm/local.h diff --git a/trunk/include/asm-arm/locks.h b/trunk/arch/arm/include/asm/locks.h similarity index 99% rename from trunk/include/asm-arm/locks.h rename to trunk/arch/arm/include/asm/locks.h index 852220eecdbc..ef4c897772d1 100644 --- a/trunk/include/asm-arm/locks.h +++ b/trunk/arch/arm/include/asm/locks.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/locks.h + * arch/arm/include/asm/locks.h * * Copyright (C) 2000 Russell King * diff --git a/trunk/include/asm-arm/mach/arch.h b/trunk/arch/arm/include/asm/mach/arch.h similarity index 97% rename from trunk/include/asm-arm/mach/arch.h rename to trunk/arch/arm/include/asm/mach/arch.h index bcc8aed7c9a9..c59842dc7cb8 100644 --- a/trunk/include/asm-arm/mach/arch.h +++ b/trunk/arch/arm/include/asm/mach/arch.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/mach/arch.h + * arch/arm/include/asm/mach/arch.h * * Copyright (C) 2000 Russell King * diff --git a/trunk/include/asm-arm/mach/dma.h b/trunk/arch/arm/include/asm/mach/dma.h similarity index 97% rename from trunk/include/asm-arm/mach/dma.h rename to trunk/arch/arm/include/asm/mach/dma.h index e7c4a20aad53..fc7278ea7146 100644 --- a/trunk/include/asm-arm/mach/dma.h +++ b/trunk/arch/arm/include/asm/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/mach/dma.h + * arch/arm/include/asm/mach/dma.h * * Copyright (C) 1998-2000 Russell King * diff --git a/trunk/include/asm-arm/mach/flash.h b/trunk/arch/arm/include/asm/mach/flash.h similarity index 96% rename from trunk/include/asm-arm/mach/flash.h rename to trunk/arch/arm/include/asm/mach/flash.h index 05b029ef6371..4ca69fe2c850 100644 --- a/trunk/include/asm-arm/mach/flash.h +++ b/trunk/arch/arm/include/asm/mach/flash.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/mach/flash.h + * arch/arm/include/asm/mach/flash.h * * Copyright (C) 2003 Russell King, All Rights Reserved. * diff --git a/trunk/include/asm-arm/mach/irda.h b/trunk/arch/arm/include/asm/mach/irda.h similarity index 93% rename from trunk/include/asm-arm/mach/irda.h rename to trunk/arch/arm/include/asm/mach/irda.h index 58984d9c0b0b..38f77b5e56cf 100644 --- a/trunk/include/asm-arm/mach/irda.h +++ b/trunk/arch/arm/include/asm/mach/irda.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/mach/irda.h + * arch/arm/include/asm/mach/irda.h * * Copyright (C) 2004 Russell King. * diff --git a/trunk/include/asm-arm/mach/irq.h b/trunk/arch/arm/include/asm/mach/irq.h similarity index 61% rename from trunk/include/asm-arm/mach/irq.h rename to trunk/arch/arm/include/asm/mach/irq.h index eb0bfba6570d..acac5302e4ea 100644 --- a/trunk/include/asm-arm/mach/irq.h +++ b/trunk/arch/arm/include/asm/mach/irq.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/mach/irq.h + * arch/arm/include/asm/mach/irq.h * * Copyright (C) 1995-2000 Russell King. * @@ -21,20 +21,6 @@ extern void (*init_arch_irq)(void); extern void init_FIQ(void); extern int show_fiq_list(struct seq_file *, void *); -/* - * Obsolete inline function for calling irq descriptor handlers. - */ -static inline void desc_handle_irq(unsigned int irq, struct irq_desc *desc) -{ - desc->handle_irq(irq, desc); -} - -void set_irq_flags(unsigned int irq, unsigned int flags); - -#define IRQF_VALID (1 << 0) -#define IRQF_PROBE (1 << 1) -#define IRQF_NOAUTOEN (1 << 2) - /* * This is for easy migration, but should be changed in the source */ @@ -45,10 +31,4 @@ do { \ spin_unlock(&desc->lock); \ } while(0) -extern unsigned long irq_err_count; -static inline void ack_bad_irq(int irq) -{ - irq_err_count++; -} - #endif diff --git a/trunk/include/asm-arm/mach/map.h b/trunk/arch/arm/include/asm/mach/map.h similarity index 96% rename from trunk/include/asm-arm/mach/map.h rename to trunk/arch/arm/include/asm/mach/map.h index 7ef3c8390180..06f583b13999 100644 --- a/trunk/include/asm-arm/mach/map.h +++ b/trunk/arch/arm/include/asm/mach/map.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/map.h + * arch/arm/include/asm/map.h * * Copyright (C) 1999-2000 Russell King * diff --git a/trunk/include/asm-arm/mach/mmc.h b/trunk/arch/arm/include/asm/mach/mmc.h similarity index 88% rename from trunk/include/asm-arm/mach/mmc.h rename to trunk/arch/arm/include/asm/mach/mmc.h index eb91145c00c4..4da332b03144 100644 --- a/trunk/include/asm-arm/mach/mmc.h +++ b/trunk/arch/arm/include/asm/mach/mmc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/mach/mmc.h + * arch/arm/include/asm/mach/mmc.h */ #ifndef ASMARM_MACH_MMC_H #define ASMARM_MACH_MMC_H diff --git a/trunk/include/asm-arm/mach/pci.h b/trunk/arch/arm/include/asm/mach/pci.h similarity index 98% rename from trunk/include/asm-arm/mach/pci.h rename to trunk/arch/arm/include/asm/mach/pci.h index 9d4f6b5ea419..32da1ae17e06 100644 --- a/trunk/include/asm-arm/mach/pci.h +++ b/trunk/arch/arm/include/asm/mach/pci.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/mach/pci.h + * arch/arm/include/asm/mach/pci.h * * Copyright (C) 2000 Russell King * diff --git a/trunk/include/asm-arm/mach/serial_at91.h b/trunk/arch/arm/include/asm/mach/serial_at91.h similarity index 94% rename from trunk/include/asm-arm/mach/serial_at91.h rename to trunk/arch/arm/include/asm/mach/serial_at91.h index 55b317a89061..ea6d063923b8 100644 --- a/trunk/include/asm-arm/mach/serial_at91.h +++ b/trunk/arch/arm/include/asm/mach/serial_at91.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/mach/serial_at91.h + * arch/arm/include/asm/mach/serial_at91.h * * Based on serial_sa1100.h by Nicolas Pitre * diff --git a/trunk/include/asm-arm/mach/serial_sa1100.h b/trunk/arch/arm/include/asm/mach/serial_sa1100.h similarity index 86% rename from trunk/include/asm-arm/mach/serial_sa1100.h rename to trunk/arch/arm/include/asm/mach/serial_sa1100.h index 20c22bb218d9..d09064bf95a0 100644 --- a/trunk/include/asm-arm/mach/serial_sa1100.h +++ b/trunk/arch/arm/include/asm/mach/serial_sa1100.h @@ -1,9 +1,9 @@ /* - * linux/include/asm-arm/mach/serial_sa1100.h + * arch/arm/include/asm/mach/serial_sa1100.h * * Author: Nicolas Pitre * - * Moved to include/asm-arm/mach and changed lots, Russell King + * Moved and changed lots, Russell King * * Low level machine dependent UART functions. */ diff --git a/trunk/include/asm-arm/mach/sharpsl_param.h b/trunk/arch/arm/include/asm/mach/sharpsl_param.h similarity index 100% rename from trunk/include/asm-arm/mach/sharpsl_param.h rename to trunk/arch/arm/include/asm/mach/sharpsl_param.h diff --git a/trunk/include/asm-arm/mach/time.h b/trunk/arch/arm/include/asm/mach/time.h similarity index 97% rename from trunk/include/asm-arm/mach/time.h rename to trunk/arch/arm/include/asm/mach/time.h index 2fd36ea0130d..b2cc1fcd0400 100644 --- a/trunk/include/asm-arm/mach/time.h +++ b/trunk/arch/arm/include/asm/mach/time.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/mach/time.h + * arch/arm/include/asm/mach/time.h * * Copyright (C) 2004 MontaVista Software, Inc. * diff --git a/trunk/include/asm-arm/mach/udc_pxa2xx.h b/trunk/arch/arm/include/asm/mach/udc_pxa2xx.h similarity index 95% rename from trunk/include/asm-arm/mach/udc_pxa2xx.h rename to trunk/arch/arm/include/asm/mach/udc_pxa2xx.h index 9e5ed7c0f27f..270902c353fd 100644 --- a/trunk/include/asm-arm/mach/udc_pxa2xx.h +++ b/trunk/arch/arm/include/asm/mach/udc_pxa2xx.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/mach/udc_pxa2xx.h + * arch/arm/include/asm/mach/udc_pxa2xx.h * * This supports machine-specific differences in how the PXA2xx * USB Device Controller (UDC) is wired. diff --git a/trunk/include/asm-arm/mc146818rtc.h b/trunk/arch/arm/include/asm/mc146818rtc.h similarity index 100% rename from trunk/include/asm-arm/mc146818rtc.h rename to trunk/arch/arm/include/asm/mc146818rtc.h diff --git a/trunk/include/asm-arm/memory.h b/trunk/arch/arm/include/asm/memory.h similarity index 99% rename from trunk/include/asm-arm/memory.h rename to trunk/arch/arm/include/asm/memory.h index 9ba4d7136e6b..92069221dca9 100644 --- a/trunk/include/asm-arm/memory.h +++ b/trunk/arch/arm/include/asm/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/memory.h + * arch/arm/include/asm/memory.h * * Copyright (C) 2000-2002 Russell King * modification for nommu, Hyok S. Choi, 2004 diff --git a/trunk/include/asm-arm/mman.h b/trunk/arch/arm/include/asm/mman.h similarity index 100% rename from trunk/include/asm-arm/mman.h rename to trunk/arch/arm/include/asm/mman.h diff --git a/trunk/include/asm-arm/mmu.h b/trunk/arch/arm/include/asm/mmu.h similarity index 100% rename from trunk/include/asm-arm/mmu.h rename to trunk/arch/arm/include/asm/mmu.h diff --git a/trunk/include/asm-arm/mmu_context.h b/trunk/arch/arm/include/asm/mmu_context.h similarity index 98% rename from trunk/include/asm-arm/mmu_context.h rename to trunk/arch/arm/include/asm/mmu_context.h index 91b9dfdfed52..a301e446007f 100644 --- a/trunk/include/asm-arm/mmu_context.h +++ b/trunk/arch/arm/include/asm/mmu_context.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/mmu_context.h + * arch/arm/include/asm/mmu_context.h * * Copyright (C) 1996 Russell King. * diff --git a/trunk/include/asm-arm/mmzone.h b/trunk/arch/arm/include/asm/mmzone.h similarity index 94% rename from trunk/include/asm-arm/mmzone.h rename to trunk/arch/arm/include/asm/mmzone.h index b87de151f0a4..f2fbb5084901 100644 --- a/trunk/include/asm-arm/mmzone.h +++ b/trunk/arch/arm/include/asm/mmzone.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/mmzone.h + * arch/arm/include/asm/mmzone.h * * 1999-12-29 Nicolas Pitre Created * diff --git a/trunk/include/asm-arm/module.h b/trunk/arch/arm/include/asm/module.h similarity index 100% rename from trunk/include/asm-arm/module.h rename to trunk/arch/arm/include/asm/module.h diff --git a/trunk/include/asm-arm/msgbuf.h b/trunk/arch/arm/include/asm/msgbuf.h similarity index 100% rename from trunk/include/asm-arm/msgbuf.h rename to trunk/arch/arm/include/asm/msgbuf.h diff --git a/trunk/include/asm-arm/mtd-xip.h b/trunk/arch/arm/include/asm/mtd-xip.h similarity index 95% rename from trunk/include/asm-arm/mtd-xip.h rename to trunk/arch/arm/include/asm/mtd-xip.h index 9eb127cc7db2..4bc50f9abe38 100644 --- a/trunk/include/asm-arm/mtd-xip.h +++ b/trunk/arch/arm/include/asm/mtd-xip.h @@ -17,7 +17,7 @@ #ifndef __ARM_MTD_XIP_H__ #define __ARM_MTD_XIP_H__ -#include +#include #include /* fill instruction prefetch */ diff --git a/trunk/include/asm-arm/mutex.h b/trunk/arch/arm/include/asm/mutex.h similarity index 98% rename from trunk/include/asm-arm/mutex.h rename to trunk/arch/arm/include/asm/mutex.h index 020bd98710a1..93226cf23ae0 100644 --- a/trunk/include/asm-arm/mutex.h +++ b/trunk/arch/arm/include/asm/mutex.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/mutex.h + * arch/arm/include/asm/mutex.h * * ARM optimized mutex locking primitives * diff --git a/trunk/include/asm-arm/nwflash.h b/trunk/arch/arm/include/asm/nwflash.h similarity index 100% rename from trunk/include/asm-arm/nwflash.h rename to trunk/arch/arm/include/asm/nwflash.h diff --git a/trunk/include/asm-arm/page-nommu.h b/trunk/arch/arm/include/asm/page-nommu.h similarity index 96% rename from trunk/include/asm-arm/page-nommu.h rename to trunk/arch/arm/include/asm/page-nommu.h index ea1cde84f500..3574c0deb37f 100644 --- a/trunk/include/asm-arm/page-nommu.h +++ b/trunk/arch/arm/include/asm/page-nommu.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/page-nommu.h + * arch/arm/include/asm/page-nommu.h * * Copyright (C) 2004 Hyok S. Choi * diff --git a/trunk/include/asm-arm/page.h b/trunk/arch/arm/include/asm/page.h similarity index 99% rename from trunk/include/asm-arm/page.h rename to trunk/arch/arm/include/asm/page.h index 7c5fc5582e5d..cf2e2680daaa 100644 --- a/trunk/include/asm-arm/page.h +++ b/trunk/arch/arm/include/asm/page.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/page.h + * arch/arm/include/asm/page.h * * Copyright (C) 1995-2003 Russell King * diff --git a/trunk/include/asm-arm/param.h b/trunk/arch/arm/include/asm/param.h similarity index 95% rename from trunk/include/asm-arm/param.h rename to trunk/arch/arm/include/asm/param.h index 15806468ba72..8b24bf94c06b 100644 --- a/trunk/include/asm-arm/param.h +++ b/trunk/arch/arm/include/asm/param.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/param.h + * arch/arm/include/asm/param.h * * Copyright (C) 1995-1999 Russell King * diff --git a/trunk/include/asm-arm/parport.h b/trunk/arch/arm/include/asm/parport.h similarity index 86% rename from trunk/include/asm-arm/parport.h rename to trunk/arch/arm/include/asm/parport.h index f2f90c76ddd1..26e94b09035a 100644 --- a/trunk/include/asm-arm/parport.h +++ b/trunk/arch/arm/include/asm/parport.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/parport.h: ARM-specific parport initialisation + * arch/arm/include/asm/parport.h: ARM-specific parport initialisation * * Copyright (C) 1999, 2000 Tim Waugh * diff --git a/trunk/include/asm-arm/pci.h b/trunk/arch/arm/include/asm/pci.h similarity index 97% rename from trunk/include/asm-arm/pci.h rename to trunk/arch/arm/include/asm/pci.h index 2d84792f2e12..968b833f3bb7 100644 --- a/trunk/include/asm-arm/pci.h +++ b/trunk/arch/arm/include/asm/pci.h @@ -4,7 +4,7 @@ #ifdef __KERNEL__ #include -#include /* for PCIBIOS_MIN_* */ +#include /* for PCIBIOS_MIN_* */ #define pcibios_scan_all_fns(a, b) 0 diff --git a/trunk/include/asm-arm/percpu.h b/trunk/arch/arm/include/asm/percpu.h similarity index 100% rename from trunk/include/asm-arm/percpu.h rename to trunk/arch/arm/include/asm/percpu.h diff --git a/trunk/include/asm-arm/pgalloc.h b/trunk/arch/arm/include/asm/pgalloc.h similarity index 98% rename from trunk/include/asm-arm/pgalloc.h rename to trunk/arch/arm/include/asm/pgalloc.h index 163b0305dd76..3dcd64bf1824 100644 --- a/trunk/include/asm-arm/pgalloc.h +++ b/trunk/arch/arm/include/asm/pgalloc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/pgalloc.h + * arch/arm/include/asm/pgalloc.h * * Copyright (C) 2000-2001 Russell King * diff --git a/trunk/include/asm-arm/pgtable-hwdef.h b/trunk/arch/arm/include/asm/pgtable-hwdef.h similarity index 98% rename from trunk/include/asm-arm/pgtable-hwdef.h rename to trunk/arch/arm/include/asm/pgtable-hwdef.h index f3b5120c99fe..fd1521d5cb9d 100644 --- a/trunk/include/asm-arm/pgtable-hwdef.h +++ b/trunk/arch/arm/include/asm/pgtable-hwdef.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/pgtable-hwdef.h + * arch/arm/include/asm/pgtable-hwdef.h * * Copyright (C) 1995-2002 Russell King * diff --git a/trunk/include/asm-arm/pgtable-nommu.h b/trunk/arch/arm/include/asm/pgtable-nommu.h similarity index 98% rename from trunk/include/asm-arm/pgtable-nommu.h rename to trunk/arch/arm/include/asm/pgtable-nommu.h index 386fcc10a973..b011f2e939aa 100644 --- a/trunk/include/asm-arm/pgtable-nommu.h +++ b/trunk/arch/arm/include/asm/pgtable-nommu.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/pgtable-nommu.h + * arch/arm/include/asm/pgtable-nommu.h * * Copyright (C) 1995-2002 Russell King * Copyright (C) 2004 Hyok S. Choi diff --git a/trunk/include/asm-arm/pgtable.h b/trunk/arch/arm/include/asm/pgtable.h similarity index 99% rename from trunk/include/asm-arm/pgtable.h rename to trunk/arch/arm/include/asm/pgtable.h index 5571c13c3f3b..8ab060a53ab0 100644 --- a/trunk/include/asm-arm/pgtable.h +++ b/trunk/arch/arm/include/asm/pgtable.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/pgtable.h + * arch/arm/include/asm/pgtable.h * * Copyright (C) 1995-2002 Russell King * diff --git a/trunk/include/asm-arm/poll.h b/trunk/arch/arm/include/asm/poll.h similarity index 100% rename from trunk/include/asm-arm/poll.h rename to trunk/arch/arm/include/asm/poll.h diff --git a/trunk/include/asm-arm/posix_types.h b/trunk/arch/arm/include/asm/posix_types.h similarity index 98% rename from trunk/include/asm-arm/posix_types.h rename to trunk/arch/arm/include/asm/posix_types.h index c37379dadcb2..2446d23bfdbf 100644 --- a/trunk/include/asm-arm/posix_types.h +++ b/trunk/arch/arm/include/asm/posix_types.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/posix_types.h + * arch/arm/include/asm/posix_types.h * * Copyright (C) 1996-1998 Russell King. * diff --git a/trunk/include/asm-arm/proc-fns.h b/trunk/arch/arm/include/asm/proc-fns.h similarity index 99% rename from trunk/include/asm-arm/proc-fns.h rename to trunk/arch/arm/include/asm/proc-fns.h index 75ec760f4c74..db80203b68e0 100644 --- a/trunk/include/asm-arm/proc-fns.h +++ b/trunk/arch/arm/include/asm/proc-fns.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/proc-fns.h + * arch/arm/include/asm/proc-fns.h * * Copyright (C) 1997-1999 Russell King * Copyright (C) 2000 Deep Blue Solutions Ltd diff --git a/trunk/include/asm-arm/processor.h b/trunk/arch/arm/include/asm/processor.h similarity index 98% rename from trunk/include/asm-arm/processor.h rename to trunk/arch/arm/include/asm/processor.h index bd8029e8dc67..b01d5e7e3d5a 100644 --- a/trunk/include/asm-arm/processor.h +++ b/trunk/arch/arm/include/asm/processor.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/processor.h + * arch/arm/include/asm/processor.h * * Copyright (C) 1995-1999 Russell King * diff --git a/trunk/include/asm-arm/procinfo.h b/trunk/arch/arm/include/asm/procinfo.h similarity index 97% rename from trunk/include/asm-arm/procinfo.h rename to trunk/arch/arm/include/asm/procinfo.h index 4d3c685075e0..ca52e584ef74 100644 --- a/trunk/include/asm-arm/procinfo.h +++ b/trunk/arch/arm/include/asm/procinfo.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/procinfo.h + * arch/arm/include/asm/procinfo.h * * Copyright (C) 1996-1999 Russell King * diff --git a/trunk/include/asm-arm/ptrace.h b/trunk/arch/arm/include/asm/ptrace.h similarity index 99% rename from trunk/include/asm-arm/ptrace.h rename to trunk/arch/arm/include/asm/ptrace.h index 8382b7510f94..b415c0e85458 100644 --- a/trunk/include/asm-arm/ptrace.h +++ b/trunk/arch/arm/include/asm/ptrace.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/ptrace.h + * arch/arm/include/asm/ptrace.h * * Copyright (C) 1996-2003 Russell King * diff --git a/trunk/include/asm-arm/resource.h b/trunk/arch/arm/include/asm/resource.h similarity index 100% rename from trunk/include/asm-arm/resource.h rename to trunk/arch/arm/include/asm/resource.h diff --git a/trunk/include/asm-arm/scatterlist.h b/trunk/arch/arm/include/asm/scatterlist.h similarity index 100% rename from trunk/include/asm-arm/scatterlist.h rename to trunk/arch/arm/include/asm/scatterlist.h diff --git a/trunk/include/asm-arm/sections.h b/trunk/arch/arm/include/asm/sections.h similarity index 100% rename from trunk/include/asm-arm/sections.h rename to trunk/arch/arm/include/asm/sections.h diff --git a/trunk/include/asm-arm/segment.h b/trunk/arch/arm/include/asm/segment.h similarity index 100% rename from trunk/include/asm-arm/segment.h rename to trunk/arch/arm/include/asm/segment.h diff --git a/trunk/include/asm-arm/sembuf.h b/trunk/arch/arm/include/asm/sembuf.h similarity index 100% rename from trunk/include/asm-arm/sembuf.h rename to trunk/arch/arm/include/asm/sembuf.h diff --git a/trunk/include/asm-arm/serial.h b/trunk/arch/arm/include/asm/serial.h similarity index 91% rename from trunk/include/asm-arm/serial.h rename to trunk/arch/arm/include/asm/serial.h index 015b262dc145..ebb049091e26 100644 --- a/trunk/include/asm-arm/serial.h +++ b/trunk/arch/arm/include/asm/serial.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/serial.h + * arch/arm/include/asm/serial.h * * Copyright (C) 1996 Russell King. * diff --git a/trunk/include/asm-arm/setup.h b/trunk/arch/arm/include/asm/setup.h similarity index 100% rename from trunk/include/asm-arm/setup.h rename to trunk/arch/arm/include/asm/setup.h diff --git a/trunk/include/asm-arm/shmbuf.h b/trunk/arch/arm/include/asm/shmbuf.h similarity index 100% rename from trunk/include/asm-arm/shmbuf.h rename to trunk/arch/arm/include/asm/shmbuf.h diff --git a/trunk/include/asm-arm/shmparam.h b/trunk/arch/arm/include/asm/shmparam.h similarity index 100% rename from trunk/include/asm-arm/shmparam.h rename to trunk/arch/arm/include/asm/shmparam.h diff --git a/trunk/include/asm-arm/sigcontext.h b/trunk/arch/arm/include/asm/sigcontext.h similarity index 100% rename from trunk/include/asm-arm/sigcontext.h rename to trunk/arch/arm/include/asm/sigcontext.h diff --git a/trunk/include/asm-arm/siginfo.h b/trunk/arch/arm/include/asm/siginfo.h similarity index 100% rename from trunk/include/asm-arm/siginfo.h rename to trunk/arch/arm/include/asm/siginfo.h diff --git a/trunk/include/asm-arm/signal.h b/trunk/arch/arm/include/asm/signal.h similarity index 100% rename from trunk/include/asm-arm/signal.h rename to trunk/arch/arm/include/asm/signal.h diff --git a/trunk/include/asm-arm/sizes.h b/trunk/arch/arm/include/asm/sizes.h similarity index 100% rename from trunk/include/asm-arm/sizes.h rename to trunk/arch/arm/include/asm/sizes.h diff --git a/trunk/include/asm-arm/smp.h b/trunk/arch/arm/include/asm/smp.h similarity index 97% rename from trunk/include/asm-arm/smp.h rename to trunk/arch/arm/include/asm/smp.h index 7fffa2404b8e..cc12a525a06a 100644 --- a/trunk/include/asm-arm/smp.h +++ b/trunk/arch/arm/include/asm/smp.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/smp.h + * arch/arm/include/asm/smp.h * * Copyright (C) 2004-2005 ARM Ltd. * @@ -17,7 +17,7 @@ #include #ifndef CONFIG_SMP -# error " included in non-SMP build" +# error " included in non-SMP build" #endif #define raw_smp_processor_id() (current_thread_info()->cpu) diff --git a/trunk/include/asm-arm/socket.h b/trunk/arch/arm/include/asm/socket.h similarity index 100% rename from trunk/include/asm-arm/socket.h rename to trunk/arch/arm/include/asm/socket.h diff --git a/trunk/include/asm-arm/sockios.h b/trunk/arch/arm/include/asm/sockios.h similarity index 100% rename from trunk/include/asm-arm/sockios.h rename to trunk/arch/arm/include/asm/sockios.h diff --git a/trunk/include/asm-arm/sparsemem.h b/trunk/arch/arm/include/asm/sparsemem.h similarity index 100% rename from trunk/include/asm-arm/sparsemem.h rename to trunk/arch/arm/include/asm/sparsemem.h diff --git a/trunk/include/asm-arm/spinlock.h b/trunk/arch/arm/include/asm/spinlock.h similarity index 100% rename from trunk/include/asm-arm/spinlock.h rename to trunk/arch/arm/include/asm/spinlock.h diff --git a/trunk/include/asm-arm/spinlock_types.h b/trunk/arch/arm/include/asm/spinlock_types.h similarity index 100% rename from trunk/include/asm-arm/spinlock_types.h rename to trunk/arch/arm/include/asm/spinlock_types.h diff --git a/trunk/include/asm-arm/stat.h b/trunk/arch/arm/include/asm/stat.h similarity index 100% rename from trunk/include/asm-arm/stat.h rename to trunk/arch/arm/include/asm/stat.h diff --git a/trunk/include/asm-arm/statfs.h b/trunk/arch/arm/include/asm/statfs.h similarity index 100% rename from trunk/include/asm-arm/statfs.h rename to trunk/arch/arm/include/asm/statfs.h diff --git a/trunk/include/asm-arm/string.h b/trunk/arch/arm/include/asm/string.h similarity index 100% rename from trunk/include/asm-arm/string.h rename to trunk/arch/arm/include/asm/string.h diff --git a/trunk/include/asm-arm/suspend.h b/trunk/arch/arm/include/asm/suspend.h similarity index 100% rename from trunk/include/asm-arm/suspend.h rename to trunk/arch/arm/include/asm/suspend.h diff --git a/trunk/include/asm-arm/system.h b/trunk/arch/arm/include/asm/system.h similarity index 100% rename from trunk/include/asm-arm/system.h rename to trunk/arch/arm/include/asm/system.h diff --git a/trunk/include/asm-arm/termbits.h b/trunk/arch/arm/include/asm/termbits.h similarity index 100% rename from trunk/include/asm-arm/termbits.h rename to trunk/arch/arm/include/asm/termbits.h diff --git a/trunk/include/asm-arm/termios.h b/trunk/arch/arm/include/asm/termios.h similarity index 100% rename from trunk/include/asm-arm/termios.h rename to trunk/arch/arm/include/asm/termios.h diff --git a/trunk/include/asm-arm/therm.h b/trunk/arch/arm/include/asm/therm.h similarity index 88% rename from trunk/include/asm-arm/therm.h rename to trunk/arch/arm/include/asm/therm.h index e51c923ecdf3..f002f0197d78 100644 --- a/trunk/include/asm-arm/therm.h +++ b/trunk/arch/arm/include/asm/therm.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/therm.h: Definitions for Dallas Semiconductor + * arch/arm/include/asm/therm.h: Definitions for Dallas Semiconductor * DS1620 thermometer driver (as used in the Rebel.com NetWinder) */ #ifndef __ASM_THERM_H diff --git a/trunk/include/asm-arm/thread_info.h b/trunk/arch/arm/include/asm/thread_info.h similarity index 97% rename from trunk/include/asm-arm/thread_info.h rename to trunk/arch/arm/include/asm/thread_info.h index d4be2d646160..e56fa48e4ae7 100644 --- a/trunk/include/asm-arm/thread_info.h +++ b/trunk/arch/arm/include/asm/thread_info.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/thread_info.h + * arch/arm/include/asm/thread_info.h * * Copyright (C) 2002 Russell King. * @@ -117,7 +117,7 @@ extern void iwmmxt_task_switch(struct thread_info *); /* * We use bit 30 of the preempt_count to indicate that kernel - * preemption is occurring. See include/asm-arm/hardirq.h. + * preemption is occurring. See . */ #define PREEMPT_ACTIVE 0x40000000 diff --git a/trunk/include/asm-arm/thread_notify.h b/trunk/arch/arm/include/asm/thread_notify.h similarity index 96% rename from trunk/include/asm-arm/thread_notify.h rename to trunk/arch/arm/include/asm/thread_notify.h index 8866e5216840..f27379d7f72a 100644 --- a/trunk/include/asm-arm/thread_notify.h +++ b/trunk/arch/arm/include/asm/thread_notify.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/thread_notify.h + * arch/arm/include/asm/thread_notify.h * * Copyright (C) 2006 Russell King. * diff --git a/trunk/include/asm-arm/timex.h b/trunk/arch/arm/include/asm/timex.h similarity index 93% rename from trunk/include/asm-arm/timex.h rename to trunk/arch/arm/include/asm/timex.h index 7b8d4cb24be0..e50e2926cd6e 100644 --- a/trunk/include/asm-arm/timex.h +++ b/trunk/arch/arm/include/asm/timex.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/timex.h + * arch/arm/include/asm/timex.h * * Copyright (C) 1997,1998 Russell King * diff --git a/trunk/include/asm-arm/tlb.h b/trunk/arch/arm/include/asm/tlb.h similarity index 98% rename from trunk/include/asm-arm/tlb.h rename to trunk/arch/arm/include/asm/tlb.h index 36bd402a21cb..857f1dfac794 100644 --- a/trunk/include/asm-arm/tlb.h +++ b/trunk/arch/arm/include/asm/tlb.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/tlb.h + * arch/arm/include/asm/tlb.h * * Copyright (C) 2002 Russell King * diff --git a/trunk/include/asm-arm/tlbflush.h b/trunk/arch/arm/include/asm/tlbflush.h similarity index 99% rename from trunk/include/asm-arm/tlbflush.h rename to trunk/arch/arm/include/asm/tlbflush.h index 909656c747ef..0d0d40f1b599 100644 --- a/trunk/include/asm-arm/tlbflush.h +++ b/trunk/arch/arm/include/asm/tlbflush.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/tlbflush.h + * arch/arm/include/asm/tlbflush.h * * Copyright (C) 1999-2003 Russell King * diff --git a/trunk/include/asm-arm/topology.h b/trunk/arch/arm/include/asm/topology.h similarity index 100% rename from trunk/include/asm-arm/topology.h rename to trunk/arch/arm/include/asm/topology.h diff --git a/trunk/include/asm-arm/traps.h b/trunk/arch/arm/include/asm/traps.h similarity index 100% rename from trunk/include/asm-arm/traps.h rename to trunk/arch/arm/include/asm/traps.h diff --git a/trunk/include/asm-arm/types.h b/trunk/arch/arm/include/asm/types.h similarity index 100% rename from trunk/include/asm-arm/types.h rename to trunk/arch/arm/include/asm/types.h diff --git a/trunk/include/asm-arm/uaccess.h b/trunk/arch/arm/include/asm/uaccess.h similarity index 99% rename from trunk/include/asm-arm/uaccess.h rename to trunk/arch/arm/include/asm/uaccess.h index 4c1a3fa9f259..d0f51ff900b5 100644 --- a/trunk/include/asm-arm/uaccess.h +++ b/trunk/arch/arm/include/asm/uaccess.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/uaccess.h + * arch/arm/include/asm/uaccess.h * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/trunk/include/asm-arm/ucontext.h b/trunk/arch/arm/include/asm/ucontext.h similarity index 100% rename from trunk/include/asm-arm/ucontext.h rename to trunk/arch/arm/include/asm/ucontext.h diff --git a/trunk/include/asm-arm/unaligned.h b/trunk/arch/arm/include/asm/unaligned.h similarity index 100% rename from trunk/include/asm-arm/unaligned.h rename to trunk/arch/arm/include/asm/unaligned.h diff --git a/trunk/include/asm-arm/unistd.h b/trunk/arch/arm/include/asm/unistd.h similarity index 99% rename from trunk/include/asm-arm/unistd.h rename to trunk/arch/arm/include/asm/unistd.h index 7c570082b1e0..f95fbb2fcb5f 100644 --- a/trunk/include/asm-arm/unistd.h +++ b/trunk/arch/arm/include/asm/unistd.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/unistd.h + * arch/arm/include/asm/unistd.h * * Copyright (C) 2001-2005 Russell King * diff --git a/trunk/include/asm-arm/user.h b/trunk/arch/arm/include/asm/user.h similarity index 100% rename from trunk/include/asm-arm/user.h rename to trunk/arch/arm/include/asm/user.h diff --git a/trunk/include/asm-arm/vfp.h b/trunk/arch/arm/include/asm/vfp.h similarity index 98% rename from trunk/include/asm-arm/vfp.h rename to trunk/arch/arm/include/asm/vfp.h index 5f9a2cb3d452..f4ab34fd4f72 100644 --- a/trunk/include/asm-arm/vfp.h +++ b/trunk/arch/arm/include/asm/vfp.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/vfp.h + * arch/arm/include/asm/vfp.h * * VFP register definitions. * First, the standard VFP set. diff --git a/trunk/include/asm-arm/vfpmacros.h b/trunk/arch/arm/include/asm/vfpmacros.h similarity index 97% rename from trunk/include/asm-arm/vfpmacros.h rename to trunk/arch/arm/include/asm/vfpmacros.h index cccb3892e73c..422f3cc204a2 100644 --- a/trunk/include/asm-arm/vfpmacros.h +++ b/trunk/arch/arm/include/asm/vfpmacros.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/vfpmacros.h + * arch/arm/include/asm/vfpmacros.h * * Assembler-only file containing VFP macros and register definitions. */ diff --git a/trunk/include/asm-arm/vga.h b/trunk/arch/arm/include/asm/vga.h similarity index 88% rename from trunk/include/asm-arm/vga.h rename to trunk/arch/arm/include/asm/vga.h index 1e0b913c3d71..4f767ad3a0bb 100644 --- a/trunk/include/asm-arm/vga.h +++ b/trunk/arch/arm/include/asm/vga.h @@ -1,7 +1,7 @@ #ifndef ASMARM_VGA_H #define ASMARM_VGA_H -#include +#include #include #define VGA_MAP_MEM(x,s) (PCIMEM_BASE + (x)) diff --git a/trunk/include/asm-arm/xor.h b/trunk/arch/arm/include/asm/xor.h similarity index 99% rename from trunk/include/asm-arm/xor.h rename to trunk/arch/arm/include/asm/xor.h index e7c4cf58bed1..7604673dc427 100644 --- a/trunk/include/asm-arm/xor.h +++ b/trunk/arch/arm/include/asm/xor.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/xor.h + * arch/arm/include/asm/xor.h * * Copyright (C) 2001 Russell King * diff --git a/trunk/arch/arm/kernel/ecard.c b/trunk/arch/arm/kernel/ecard.c index f5cfdabcb87d..8192fe8409d3 100644 --- a/trunk/arch/arm/kernel/ecard.c +++ b/trunk/arch/arm/kernel/ecard.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include #include diff --git a/trunk/arch/arm/kernel/head-common.S b/trunk/arch/arm/kernel/head-common.S index 7e9c00a8a412..1c3c6ea5f9e7 100644 --- a/trunk/arch/arm/kernel/head-common.S +++ b/trunk/arch/arm/kernel/head-common.S @@ -181,7 +181,7 @@ ENTRY(lookup_processor_type) ldmfd sp!, {r4 - r7, r9, pc} /* - * Look in include/asm-arm/procinfo.h and arch/arm/kernel/arch.[ch] for + * Look in and arch/arm/kernel/arch.[ch] for * more information about the __proc_info and __arch_info structures. */ .long __proc_info_begin diff --git a/trunk/arch/arm/kernel/head-nommu.S b/trunk/arch/arm/kernel/head-nommu.S index 5d78ffb8a9a7..27329bd32037 100644 --- a/trunk/arch/arm/kernel/head-nommu.S +++ b/trunk/arch/arm/kernel/head-nommu.S @@ -15,7 +15,6 @@ #include #include -#include #include #include #include diff --git a/trunk/arch/arm/kernel/irq.c b/trunk/arch/arm/kernel/irq.c index 11dcd52e51be..f88efb135b70 100644 --- a/trunk/arch/arm/kernel/irq.c +++ b/trunk/arch/arm/kernel/irq.c @@ -38,6 +38,7 @@ #include #include +#include #include /* diff --git a/trunk/arch/arm/lib/ecard.S b/trunk/arch/arm/lib/ecard.S index c55aaa2a2088..79cf247ad525 100644 --- a/trunk/arch/arm/lib/ecard.S +++ b/trunk/arch/arm/lib/ecard.S @@ -12,7 +12,7 @@ */ #include #include -#include +#include #define CPSR2SPSR(rt) \ mrs rt, cpsr; \ diff --git a/trunk/arch/arm/lib/getuser.S b/trunk/arch/arm/lib/getuser.S index 1dd8ea4f9a9c..2034d4dbe6ad 100644 --- a/trunk/arch/arm/lib/getuser.S +++ b/trunk/arch/arm/lib/getuser.S @@ -20,7 +20,7 @@ * r2, r3 contains the zero-extended value * lr corrupted * - * No other registers must be altered. (see include/asm-arm/uaccess.h + * No other registers must be altered. (see * for specific ASM register usage). * * Note that ADDR_LIMIT is either 0 or 0xc0000000. diff --git a/trunk/arch/arm/lib/io-readsw-armv3.S b/trunk/arch/arm/lib/io-readsw-armv3.S index 4ef904185142..4cc4411595f5 100644 --- a/trunk/arch/arm/lib/io-readsw-armv3.S +++ b/trunk/arch/arm/lib/io-readsw-armv3.S @@ -9,7 +9,7 @@ */ #include #include -#include +#include .Linsw_bad_alignment: adr r0, .Linsw_bad_align_msg diff --git a/trunk/arch/arm/lib/io-writesw-armv3.S b/trunk/arch/arm/lib/io-writesw-armv3.S index 1607a29f49b7..0a34752bc448 100644 --- a/trunk/arch/arm/lib/io-writesw-armv3.S +++ b/trunk/arch/arm/lib/io-writesw-armv3.S @@ -9,7 +9,7 @@ */ #include #include -#include +#include .Loutsw_bad_alignment: adr r0, .Loutsw_bad_align_msg diff --git a/trunk/arch/arm/lib/putuser.S b/trunk/arch/arm/lib/putuser.S index 8620afe54f72..08ec7dffa52e 100644 --- a/trunk/arch/arm/lib/putuser.S +++ b/trunk/arch/arm/lib/putuser.S @@ -20,7 +20,7 @@ * Outputs: r0 is the error code * lr corrupted * - * No other registers must be altered. (see include/asm-arm/uaccess.h + * No other registers must be altered. (see * for specific ASM register usage). * * Note that ADDR_LIMIT is either 0 or 0xc0000000 diff --git a/trunk/arch/arm/mach-aaec2000/aaed2000.c b/trunk/arch/arm/mach-aaec2000/aaed2000.c index 83f57da3184c..08f030d506b8 100644 --- a/trunk/arch/arm/mach-aaec2000/aaed2000.c +++ b/trunk/arch/arm/mach-aaec2000/aaed2000.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/trunk/arch/arm/mach-aaec2000/core.c b/trunk/arch/arm/mach-aaec2000/core.c index b016be2b0e35..2e0cec2dc997 100644 --- a/trunk/arch/arm/mach-aaec2000/core.c +++ b/trunk/arch/arm/mach-aaec2000/core.c @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff --git a/trunk/arch/arm/mach-at91/at91x40_time.c b/trunk/arch/arm/mach-at91/at91x40_time.c index eddc882f1b4a..44690440e846 100644 --- a/trunk/arch/arm/mach-at91/at91x40_time.c +++ b/trunk/arch/arm/mach-at91/at91x40_time.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/trunk/arch/arm/mach-at91/board-1arm.c b/trunk/arch/arm/mach-at91/board-1arm.c index 2d3d4b6f7b02..fc0f293174cb 100644 --- a/trunk/arch/arm/mach-at91/board-1arm.c +++ b/trunk/arch/arm/mach-at91/board-1arm.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/trunk/arch/arm/mach-at91/board-cam60.c b/trunk/arch/arm/mach-at91/board-cam60.c index af2c33aff1a8..17faf3cea12f 100644 --- a/trunk/arch/arm/mach-at91/board-cam60.c +++ b/trunk/arch/arm/mach-at91/board-cam60.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/trunk/arch/arm/mach-at91/board-cap9adk.c b/trunk/arch/arm/mach-at91/board-cap9adk.c index 1f4725972edc..fd21d4240e8e 100644 --- a/trunk/arch/arm/mach-at91/board-cap9adk.c +++ b/trunk/arch/arm/mach-at91/board-cap9adk.c @@ -33,7 +33,7 @@ #include