From 0dc89c889ad4d74af5815019a1ab9e1064c959d3 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Sun, 27 Jul 2008 23:00:59 +0200 Subject: [PATCH] --- yaml --- r: 106673 b: refs/heads/master c: a439fe51a1f8eb087c22dd24d69cebae4a3addac h: refs/heads/master i: 106671: e918d6cc52687cd186826fed99efb8ec69b0d1ab v: v3 --- [refs] | 2 +- trunk/Documentation/SubmittingPatches | 26 - trunk/Documentation/arm/Interrupts | 10 +- trunk/Documentation/i2c/upgrading-clients | 281 ----- trunk/Makefile | 6 +- trunk/arch/arm/Kconfig | 6 +- trunk/arch/arm/Makefile | 2 +- trunk/arch/arm/common/locomo.c | 10 +- trunk/arch/arm/common/sa1111.c | 14 +- trunk/arch/arm/configs/eseries_pxa_defconfig | 1073 ++++++++++------- trunk/arch/arm/mach-at91/board-cap9adk.c | 6 +- trunk/arch/arm/mach-at91/board-yl-9200.c | 0 trunk/arch/arm/mach-at91/irq.c | 8 +- trunk/arch/arm/mach-ep93xx/core.c | 14 +- trunk/arch/arm/mach-imx/irq.c | 12 +- trunk/arch/arm/mach-ixp2000/core.c | 8 +- trunk/arch/arm/mach-ixp23xx/core.c | 10 +- trunk/arch/arm/mach-ixp23xx/roadrunner.c | 4 +- trunk/arch/arm/mach-ixp4xx/avila-pci.c | 8 +- trunk/arch/arm/mach-ixp4xx/common.c | 10 +- trunk/arch/arm/mach-ixp4xx/coyote-pci.c | 4 +- trunk/arch/arm/mach-ixp4xx/dsmg600-pci.c | 12 +- trunk/arch/arm/mach-ixp4xx/fsg-pci.c | 6 +- trunk/arch/arm/mach-ixp4xx/gateway7001-pci.c | 4 +- trunk/arch/arm/mach-ixp4xx/gtwx5715-pci.c | 8 +- trunk/arch/arm/mach-ixp4xx/ixdp425-pci.c | 8 +- trunk/arch/arm/mach-ixp4xx/ixdpg425-pci.c | 4 +- trunk/arch/arm/mach-ixp4xx/nas100d-pci.c | 10 +- trunk/arch/arm/mach-ixp4xx/nslu2-pci.c | 6 +- trunk/arch/arm/mach-ixp4xx/wg302v2-pci.c | 4 +- trunk/arch/arm/mach-ks8695/irq.c | 10 +- trunk/arch/arm/mach-netx/generic.c | 8 +- trunk/arch/arm/mach-omap1/board-osk.c | 6 +- trunk/arch/arm/mach-omap1/board-palmz71.c | 4 +- trunk/arch/arm/mach-omap1/board-voiceblue.c | 8 +- trunk/arch/arm/mach-omap1/fpga.c | 2 +- trunk/arch/arm/mach-omap2/board-apollon.c | 6 +- trunk/arch/arm/mach-orion5x/db88f5281-setup.c | 4 +- trunk/arch/arm/mach-orion5x/irq.c | 12 +- trunk/arch/arm/mach-orion5x/rd88f5182-setup.c | 4 +- trunk/arch/arm/mach-orion5x/ts209-setup.c | 4 +- trunk/arch/arm/mach-pnx4008/irq.c | 10 +- trunk/arch/arm/mach-pxa/cm-x270-pci.c | 2 +- trunk/arch/arm/mach-pxa/lpd270.c | 2 +- trunk/arch/arm/mach-pxa/lubbock.c | 2 +- trunk/arch/arm/mach-pxa/mainstone.c | 2 +- trunk/arch/arm/mach-pxa/sharpsl_pm.c | 8 +- trunk/arch/arm/mach-pxa/trizeps4.c | 2 +- trunk/arch/arm/mach-sa1100/cerf.c | 2 +- trunk/arch/arm/mach-sa1100/h3600.c | 2 +- trunk/arch/arm/mach-sa1100/irq.c | 8 +- trunk/arch/arm/mach-sa1100/neponset.c | 2 +- trunk/arch/arm/mach-sa1100/pleb.c | 2 +- trunk/arch/arm/mm/fault-armv.c | 10 +- trunk/arch/arm/plat-mxc/gpio.c | 10 +- trunk/arch/arm/plat-omap/gpio.c | 28 +- trunk/arch/arm/plat-s3c24xx/Kconfig | 2 +- trunk/arch/arm/plat-s3c24xx/irq.c | 12 +- .../sparc/include/asm}/Kbuild | 0 .../sparc/include/asm}/agp.h | 0 .../sparc/include/asm}/apb.h | 0 .../sparc/include/asm}/apc.h | 0 .../sparc/include/asm}/asi.h | 0 .../sparc/include/asm}/asmmacro.h | 0 .../sparc/include/asm}/atomic.h | 4 +- .../sparc/include/asm}/atomic_32.h | 0 .../sparc/include/asm}/atomic_64.h | 0 .../sparc/include/asm}/auxio.h | 4 +- .../sparc/include/asm}/auxio_32.h | 2 +- .../sparc/include/asm}/auxio_64.h | 0 .../sparc/include/asm}/auxvec.h | 0 .../sparc/include/asm}/backoff.h | 0 .../sparc/include/asm}/bbc.h | 0 .../sparc/include/asm}/bitext.h | 0 .../sparc/include/asm}/bitops.h | 4 +- .../sparc/include/asm}/bitops_32.h | 0 .../sparc/include/asm}/bitops_64.h | 0 .../sparc/include/asm}/bpp.h | 0 .../sparc/include/asm}/btfixup.h | 2 +- .../sparc/include/asm}/bug.h | 0 .../sparc/include/asm}/bugs.h | 2 +- .../sparc/include/asm}/byteorder.h | 0 .../sparc/include/asm}/cache.h | 0 .../sparc/include/asm}/cacheflush.h | 4 +- .../sparc/include/asm}/cacheflush_32.h | 0 .../sparc/include/asm}/cacheflush_64.h | 0 .../sparc/include/asm}/chafsr.h | 0 .../sparc/include/asm}/checksum.h | 4 +- .../sparc/include/asm}/checksum_32.h | 0 .../sparc/include/asm}/checksum_64.h | 0 .../sparc/include/asm}/chmctrl.h | 0 .../sparc/include/asm}/clock.h | 0 .../sparc/include/asm}/cmt.h | 0 .../sparc/include/asm}/compat.h | 0 .../sparc/include/asm}/compat_signal.h | 0 .../sparc/include/asm}/contregs.h | 0 .../sparc/include/asm}/cpudata.h | 4 +- .../sparc/include/asm}/cpudata_32.h | 2 +- .../sparc/include/asm}/cpudata_64.h | 0 .../sparc/include/asm}/cputime.h | 0 .../sparc/include/asm}/current.h | 2 +- .../sparc/include/asm}/cypress.h | 0 .../sparc/include/asm}/dcr.h | 0 .../sparc/include/asm}/dcu.h | 0 .../sparc/include/asm}/delay.h | 4 +- .../sparc/include/asm}/delay_32.h | 0 .../sparc/include/asm}/delay_64.h | 0 .../sparc/include/asm}/device.h | 0 .../sparc/include/asm}/display7seg.h | 0 .../sparc/include/asm}/div64.h | 0 .../sparc/include/asm}/dma-mapping.h | 4 +- .../sparc/include/asm}/dma-mapping_32.h | 0 .../sparc/include/asm}/dma-mapping_64.h | 0 .../sparc/include/asm}/dma.h | 4 +- .../sparc/include/asm}/dma_32.h | 2 +- .../sparc/include/asm}/dma_64.h | 2 +- .../sparc/include/asm}/ebus.h | 4 +- .../sparc/include/asm}/ebus_32.h | 0 .../sparc/include/asm}/ebus_64.h | 0 .../sparc/include/asm}/ecc.h | 0 .../sparc/include/asm}/eeprom.h | 0 .../sparc/include/asm}/elf.h | 4 +- .../sparc/include/asm}/elf_32.h | 0 .../sparc/include/asm}/elf_64.h | 0 .../sparc/include/asm}/emergency-restart.h | 0 .../sparc/include/asm}/envctrl.h | 0 .../sparc/include/asm}/errno.h | 0 .../sparc/include/asm}/estate.h | 0 .../asm-sparc => arch/sparc/include/asm}/fb.h | 0 .../sparc/include/asm}/fbio.h | 0 .../sparc/include/asm}/fcntl.h | 0 .../sparc/include/asm}/fhc.h | 0 .../sparc/include/asm}/fixmap.h | 0 .../sparc/include/asm}/floppy.h | 4 +- .../sparc/include/asm}/floppy_32.h | 2 +- .../sparc/include/asm}/floppy_64.h | 0 .../sparc/include/asm}/fpumacro.h | 0 .../sparc/include/asm}/ftrace.h | 0 .../sparc/include/asm}/futex.h | 4 +- .../sparc/include/asm}/futex_32.h | 0 .../sparc/include/asm}/futex_64.h | 0 .../sparc/include/asm}/hardirq.h | 4 +- .../sparc/include/asm}/hardirq_32.h | 0 .../sparc/include/asm}/hardirq_64.h | 0 .../sparc/include/asm}/head.h | 4 +- .../sparc/include/asm}/head_32.h | 0 .../sparc/include/asm}/head_64.h | 0 .../sparc/include/asm}/highmem.h | 0 .../sparc/include/asm}/hugetlb.h | 0 .../sparc/include/asm}/hvtramp.h | 0 .../sparc/include/asm}/hw_irq.h | 0 .../sparc/include/asm}/hypervisor.h | 0 .../sparc/include/asm}/ide.h | 0 .../sparc/include/asm}/idprom.h | 0 .../sparc/include/asm}/intr_queue.h | 0 .../sparc/include/asm}/io-unit.h | 0 .../asm-sparc => arch/sparc/include/asm}/io.h | 4 +- .../sparc/include/asm}/io_32.h | 0 .../sparc/include/asm}/io_64.h | 0 .../sparc/include/asm}/ioctl.h | 0 .../sparc/include/asm}/ioctls.h | 0 .../sparc/include/asm}/iommu.h | 4 +- .../sparc/include/asm}/iommu_32.h | 0 .../sparc/include/asm}/iommu_64.h | 0 .../sparc/include/asm}/ipcbuf.h | 4 +- .../sparc/include/asm}/ipcbuf_32.h | 0 .../sparc/include/asm}/ipcbuf_64.h | 0 .../sparc/include/asm}/irq.h | 4 +- .../sparc/include/asm}/irq_32.h | 0 .../sparc/include/asm}/irq_64.h | 0 .../sparc/include/asm}/irq_regs.h | 0 .../sparc/include/asm}/irqflags.h | 4 +- .../sparc/include/asm}/irqflags_32.h | 2 +- .../sparc/include/asm}/irqflags_64.h | 2 +- .../sparc/include/asm}/jsflash.h | 0 .../sparc/include/asm}/kdebug.h | 4 +- .../sparc/include/asm}/kdebug_32.h | 0 .../sparc/include/asm}/kdebug_64.h | 0 .../sparc/include/asm}/kgdb.h | 0 .../sparc/include/asm}/kmap_types.h | 0 .../sparc/include/asm}/kprobes.h | 0 .../sparc/include/asm}/ldc.h | 0 .../sparc/include/asm}/linkage.h | 0 .../sparc/include/asm}/lmb.h | 0 .../sparc/include/asm}/local.h | 0 .../sparc/include/asm}/lsu.h | 0 .../sparc/include/asm}/machines.h | 0 .../sparc/include/asm}/mbus.h | 0 .../sparc/include/asm}/mc146818rtc.h | 4 +- .../sparc/include/asm}/mc146818rtc_32.h | 0 .../sparc/include/asm}/mc146818rtc_64.h | 0 .../sparc/include/asm}/mdesc.h | 0 .../sparc/include/asm}/memreg.h | 0 .../sparc/include/asm}/mman.h | 0 .../sparc/include/asm}/mmu.h | 4 +- .../sparc/include/asm}/mmu_32.h | 0 .../sparc/include/asm}/mmu_64.h | 0 .../sparc/include/asm}/mmu_context.h | 4 +- .../sparc/include/asm}/mmu_context_32.h | 0 .../sparc/include/asm}/mmu_context_64.h | 0 .../sparc/include/asm}/mmzone.h | 0 .../sparc/include/asm}/module.h | 4 +- .../sparc/include/asm}/module_32.h | 0 .../sparc/include/asm}/module_64.h | 0 .../sparc/include/asm}/mostek.h | 4 +- .../sparc/include/asm}/mostek_32.h | 0 .../sparc/include/asm}/mostek_64.h | 0 .../sparc/include/asm}/mpmbox.h | 0 .../sparc/include/asm}/msgbuf.h | 0 .../sparc/include/asm}/msi.h | 0 .../sparc/include/asm}/mutex.h | 0 .../sparc/include/asm}/mxcc.h | 0 .../sparc/include/asm}/ns87303.h | 0 .../sparc/include/asm}/obio.h | 0 .../sparc/include/asm}/of_device.h | 0 .../sparc/include/asm}/of_platform.h | 4 +- .../sparc/include/asm}/of_platform_32.h | 2 +- .../sparc/include/asm}/of_platform_64.h | 2 +- .../sparc/include/asm}/openprom.h | 4 +- .../sparc/include/asm}/openprom_32.h | 0 .../sparc/include/asm}/openprom_64.h | 0 .../sparc/include/asm}/openpromio.h | 0 .../sparc/include/asm}/oplib.h | 4 +- .../sparc/include/asm}/oplib_32.h | 0 .../sparc/include/asm}/oplib_64.h | 0 .../sparc/include/asm}/page.h | 4 +- .../sparc/include/asm}/page_32.h | 0 .../sparc/include/asm}/page_64.h | 0 .../sparc/include/asm}/param.h | 0 .../sparc/include/asm}/parport.h | 0 .../sparc/include/asm}/pbm.h | 0 .../sparc/include/asm}/pci.h | 4 +- .../sparc/include/asm}/pci_32.h | 0 .../sparc/include/asm}/pci_64.h | 0 .../sparc/include/asm}/pcic.h | 0 .../sparc/include/asm}/percpu.h | 4 +- .../sparc/include/asm}/percpu_32.h | 0 .../sparc/include/asm}/percpu_64.h | 0 .../sparc/include/asm}/perfctr.h | 0 .../sparc/include/asm}/pgalloc.h | 4 +- .../sparc/include/asm}/pgalloc_32.h | 0 .../sparc/include/asm}/pgalloc_64.h | 0 .../sparc/include/asm}/pgtable.h | 4 +- .../sparc/include/asm}/pgtable_32.h | 2 +- .../sparc/include/asm}/pgtable_64.h | 0 .../sparc/include/asm}/pgtsrmmu.h | 0 .../sparc/include/asm}/pgtsun4.h | 0 .../sparc/include/asm}/pgtsun4c.h | 0 .../sparc/include/asm}/pil.h | 0 .../sparc/include/asm}/poll.h | 0 .../sparc/include/asm}/posix_types.h | 4 +- .../sparc/include/asm}/posix_types_32.h | 0 .../sparc/include/asm}/posix_types_64.h | 0 .../sparc/include/asm}/processor.h | 4 +- .../sparc/include/asm}/processor_32.h | 2 +- .../sparc/include/asm}/processor_64.h | 2 +- .../sparc/include/asm}/prom.h | 0 .../sparc/include/asm}/psr.h | 0 .../sparc/include/asm}/psrcompat.h | 0 .../sparc/include/asm}/pstate.h | 0 .../sparc/include/asm}/ptrace.h | 4 +- .../sparc/include/asm}/ptrace_32.h | 0 .../sparc/include/asm}/ptrace_64.h | 0 .../sparc/include/asm}/reboot.h | 0 .../sparc/include/asm}/reg.h | 4 +- .../sparc/include/asm}/reg_32.h | 2 +- .../sparc/include/asm}/reg_64.h | 2 +- .../sparc/include/asm}/resource.h | 0 .../sparc/include/asm}/ross.h | 0 .../sparc/include/asm}/rtc.h | 0 .../sparc/include/asm}/rwsem-const.h | 0 .../sparc/include/asm}/rwsem.h | 0 .../sparc/include/asm}/sbi.h | 0 .../sparc/include/asm}/sbus.h | 4 +- .../sparc/include/asm}/sbus_32.h | 0 .../sparc/include/asm}/sbus_64.h | 0 .../sparc/include/asm}/scatterlist.h | 4 +- .../sparc/include/asm}/scatterlist_32.h | 0 .../sparc/include/asm}/scatterlist_64.h | 0 .../sparc/include/asm}/scratchpad.h | 0 .../sparc/include/asm}/seccomp.h | 0 .../sparc/include/asm}/sections.h | 4 +- .../sparc/include/asm}/sections_32.h | 0 .../sparc/include/asm}/sections_64.h | 0 .../sparc/include/asm}/sembuf.h | 0 .../sparc/include/asm}/setup.h | 0 .../sparc/include/asm}/sfafsr.h | 0 .../sparc/include/asm}/sfp-machine.h | 4 +- .../sparc/include/asm}/sfp-machine_32.h | 0 .../sparc/include/asm}/sfp-machine_64.h | 0 .../sparc/include/asm}/shmbuf.h | 0 .../sparc/include/asm}/shmparam.h | 4 +- .../sparc/include/asm}/shmparam_32.h | 0 .../sparc/include/asm}/shmparam_64.h | 0 .../sparc/include/asm}/sigcontext.h | 4 +- .../sparc/include/asm}/sigcontext_32.h | 0 .../sparc/include/asm}/sigcontext_64.h | 0 .../sparc/include/asm}/siginfo.h | 4 +- .../sparc/include/asm}/siginfo_32.h | 0 .../sparc/include/asm}/siginfo_64.h | 0 .../sparc/include/asm}/signal.h | 4 +- .../sparc/include/asm}/signal_32.h | 0 .../sparc/include/asm}/signal_64.h | 0 .../sparc/include/asm}/smp.h | 4 +- .../sparc/include/asm}/smp_32.h | 0 .../sparc/include/asm}/smp_64.h | 0 .../sparc/include/asm}/smpprim.h | 0 .../sparc/include/asm}/socket.h | 0 .../sparc/include/asm}/sockios.h | 0 .../sparc/include/asm}/sparsemem.h | 0 .../sparc/include/asm}/spinlock.h | 4 +- .../sparc/include/asm}/spinlock_32.h | 0 .../sparc/include/asm}/spinlock_64.h | 0 .../sparc/include/asm}/spinlock_types.h | 0 .../sparc/include/asm}/spitfire.h | 0 .../sparc/include/asm}/sstate.h | 0 .../sparc/include/asm}/stacktrace.h | 0 .../sparc/include/asm}/starfire.h | 0 .../sparc/include/asm}/stat.h | 4 +- .../sparc/include/asm}/stat_32.h | 0 .../sparc/include/asm}/stat_64.h | 0 .../sparc/include/asm}/statfs.h | 4 +- .../sparc/include/asm}/statfs_32.h | 0 .../sparc/include/asm}/statfs_64.h | 0 .../sparc/include/asm}/string.h | 4 +- .../sparc/include/asm}/string_32.h | 0 .../sparc/include/asm}/string_64.h | 0 .../sparc/include/asm}/sun4paddr.h | 0 .../sparc/include/asm}/sun4prom.h | 0 .../sparc/include/asm}/sunbpp.h | 2 +- .../sparc/include/asm}/swift.h | 0 .../sparc/include/asm}/syscalls.h | 0 .../sparc/include/asm}/sysen.h | 0 .../sparc/include/asm}/system.h | 4 +- .../sparc/include/asm}/system_32.h | 0 .../sparc/include/asm}/system_64.h | 0 .../sparc/include/asm}/termbits.h | 0 .../sparc/include/asm}/termios.h | 0 .../sparc/include/asm}/thread_info.h | 4 +- .../sparc/include/asm}/thread_info_32.h | 0 .../sparc/include/asm}/thread_info_64.h | 0 .../sparc/include/asm}/timer.h | 4 +- .../sparc/include/asm}/timer_32.h | 0 .../sparc/include/asm}/timer_64.h | 0 .../sparc/include/asm}/timex.h | 4 +- .../sparc/include/asm}/timex_32.h | 2 +- .../sparc/include/asm}/timex_64.h | 2 +- .../sparc/include/asm}/tlb.h | 4 +- .../sparc/include/asm}/tlb_32.h | 0 .../sparc/include/asm}/tlb_64.h | 0 .../sparc/include/asm}/tlbflush.h | 4 +- .../sparc/include/asm}/tlbflush_32.h | 0 .../sparc/include/asm}/tlbflush_64.h | 0 .../sparc/include/asm}/topology.h | 4 +- .../sparc/include/asm}/topology_32.h | 0 .../sparc/include/asm}/topology_64.h | 0 .../sparc/include/asm}/traps.h | 0 .../sparc/include/asm}/tsb.h | 0 .../sparc/include/asm}/tsunami.h | 0 .../sparc/include/asm}/ttable.h | 0 .../sparc/include/asm}/turbosparc.h | 0 .../sparc/include/asm}/types.h | 0 .../sparc/include/asm}/uaccess.h | 4 +- .../sparc/include/asm}/uaccess_32.h | 0 .../sparc/include/asm}/uaccess_64.h | 0 .../sparc/include/asm}/uctx.h | 0 .../sparc/include/asm}/unaligned.h | 0 .../sparc/include/asm}/unistd.h | 4 +- .../sparc/include/asm}/unistd_32.h | 0 .../sparc/include/asm}/unistd_64.h | 0 .../sparc/include/asm}/upa.h | 0 .../sparc/include/asm}/user.h | 0 .../sparc/include/asm}/utrap.h | 2 +- .../sparc/include/asm}/vac-ops.h | 0 .../sparc/include/asm}/vaddrs.h | 2 +- .../sparc/include/asm}/vfc_ioctls.h | 0 .../sparc/include/asm}/vga.h | 0 .../sparc/include/asm}/viking.h | 0 .../sparc/include/asm}/vio.h | 0 .../sparc/include/asm}/visasm.h | 0 .../sparc/include/asm}/watchdog.h | 0 .../sparc/include/asm}/winmacro.h | 0 .../sparc/include/asm}/xor.h | 4 +- .../sparc/include/asm}/xor_32.h | 2 +- .../sparc/include/asm}/xor_64.h | 2 +- trunk/arch/sparc64/kernel/compat_audit.c | 2 +- trunk/arch/x86/kernel/head_32.S | 8 +- trunk/drivers/acpi/processor_idle.c | 15 +- trunk/drivers/ata/pata_ixp4xx_cf.c | 2 +- trunk/drivers/base/memory.c | 3 +- trunk/drivers/char/nwflash.c | 6 +- .../drivers/char/pcmcia/ipwireless/hardware.c | 275 ++--- .../drivers/char/pcmcia/ipwireless/hardware.h | 4 +- trunk/drivers/char/pcmcia/ipwireless/main.c | 86 +- trunk/drivers/char/pcmcia/ipwireless/main.h | 5 - .../drivers/char/pcmcia/ipwireless/network.c | 58 +- .../drivers/char/pcmcia/ipwireless/network.h | 1 - trunk/drivers/char/pcmcia/ipwireless/tty.c | 2 +- trunk/drivers/cpuidle/cpuidle.c | 2 +- trunk/drivers/i2c/busses/i2c-bfin-twi.c | 35 +- trunk/drivers/i2c/busses/i2c-gpio.c | 9 +- trunk/drivers/i2c/busses/i2c-s3c2410.c | 129 +- trunk/drivers/input/touchscreen/corgi_ts.c | 8 +- .../input/touchscreen/mainstone-wm97xx.c | 2 +- trunk/drivers/mfd/asic3.c | 14 +- trunk/drivers/mfd/tc6393xb.c | 2 +- trunk/drivers/pcmcia/soc_common.c | 12 +- trunk/drivers/video/am200epd.c | 2 +- trunk/drivers/video/omap/sossi.c | 2 +- trunk/drivers/video/pxafb.c | 2 +- trunk/fs/nfs/super.c | 6 +- trunk/fs/nfs/unlink.c | 3 +- trunk/fs/proc/base.c | 10 +- trunk/include/asm-arm/arch-pnx4008/irqs.h | 48 +- trunk/include/asm-arm/arch-pxa/idp.h | 10 +- .../asm-arm/arch-pxa/pcm990_baseboard.h | 14 +- trunk/include/asm-arm/arch-pxa/pxa25x-udc.h | 2 +- trunk/include/asm-arm/arch-sa1100/ide.h | 2 +- trunk/include/asm-arm/bitops.h | 9 +- trunk/include/asm-arm/cacheflush.h | 17 +- trunk/include/asm-arm/irq.h | 17 + trunk/include/asm-arm/pci.h | 8 - trunk/include/asm-arm/plat-s3c/iic.h | 1 - trunk/include/asm-sparc64/Kbuild | 1 - trunk/include/asm-sparc64/agp.h | 1 - trunk/include/asm-sparc64/apb.h | 1 - trunk/include/asm-sparc64/asi.h | 1 - trunk/include/asm-sparc64/atomic.h | 1 - trunk/include/asm-sparc64/auxio.h | 1 - trunk/include/asm-sparc64/auxvec.h | 1 - trunk/include/asm-sparc64/backoff.h | 1 - trunk/include/asm-sparc64/bbc.h | 1 - trunk/include/asm-sparc64/bitops.h | 1 - trunk/include/asm-sparc64/bpp.h | 1 - trunk/include/asm-sparc64/bug.h | 1 - trunk/include/asm-sparc64/bugs.h | 1 - trunk/include/asm-sparc64/byteorder.h | 1 - trunk/include/asm-sparc64/cache.h | 1 - trunk/include/asm-sparc64/cacheflush.h | 1 - trunk/include/asm-sparc64/chafsr.h | 1 - trunk/include/asm-sparc64/checksum.h | 1 - trunk/include/asm-sparc64/chmctrl.h | 1 - trunk/include/asm-sparc64/cmt.h | 1 - trunk/include/asm-sparc64/compat.h | 1 - trunk/include/asm-sparc64/compat_signal.h | 1 - trunk/include/asm-sparc64/cpudata.h | 1 - trunk/include/asm-sparc64/cputime.h | 1 - trunk/include/asm-sparc64/current.h | 1 - trunk/include/asm-sparc64/dcr.h | 1 - trunk/include/asm-sparc64/dcu.h | 1 - trunk/include/asm-sparc64/delay.h | 1 - trunk/include/asm-sparc64/device.h | 1 - trunk/include/asm-sparc64/display7seg.h | 1 - trunk/include/asm-sparc64/div64.h | 1 - trunk/include/asm-sparc64/dma-mapping.h | 1 - trunk/include/asm-sparc64/dma.h | 1 - trunk/include/asm-sparc64/ebus.h | 1 - trunk/include/asm-sparc64/elf.h | 1 - trunk/include/asm-sparc64/emergency-restart.h | 1 - trunk/include/asm-sparc64/envctrl.h | 1 - trunk/include/asm-sparc64/errno.h | 1 - trunk/include/asm-sparc64/estate.h | 1 - trunk/include/asm-sparc64/fb.h | 1 - trunk/include/asm-sparc64/fbio.h | 1 - trunk/include/asm-sparc64/fcntl.h | 1 - trunk/include/asm-sparc64/fhc.h | 1 - trunk/include/asm-sparc64/floppy.h | 1 - trunk/include/asm-sparc64/fpumacro.h | 1 - trunk/include/asm-sparc64/futex.h | 1 - trunk/include/asm-sparc64/hardirq.h | 1 - trunk/include/asm-sparc64/head.h | 1 - trunk/include/asm-sparc64/hugetlb.h | 1 - trunk/include/asm-sparc64/hvtramp.h | 1 - trunk/include/asm-sparc64/hw_irq.h | 1 - trunk/include/asm-sparc64/hypervisor.h | 1 - trunk/include/asm-sparc64/ide.h | 1 - trunk/include/asm-sparc64/idprom.h | 1 - trunk/include/asm-sparc64/intr_queue.h | 1 - trunk/include/asm-sparc64/io.h | 1 - trunk/include/asm-sparc64/ioctl.h | 1 - trunk/include/asm-sparc64/ioctls.h | 1 - trunk/include/asm-sparc64/iommu.h | 1 - trunk/include/asm-sparc64/ipcbuf.h | 1 - trunk/include/asm-sparc64/irq.h | 1 - trunk/include/asm-sparc64/irq_regs.h | 1 - trunk/include/asm-sparc64/irqflags.h | 1 - trunk/include/asm-sparc64/kdebug.h | 1 - trunk/include/asm-sparc64/kgdb.h | 1 - trunk/include/asm-sparc64/kmap_types.h | 1 - trunk/include/asm-sparc64/kprobes.h | 1 - trunk/include/asm-sparc64/ldc.h | 1 - trunk/include/asm-sparc64/linkage.h | 1 - trunk/include/asm-sparc64/lmb.h | 1 - trunk/include/asm-sparc64/local.h | 1 - trunk/include/asm-sparc64/lsu.h | 1 - trunk/include/asm-sparc64/mc146818rtc.h | 1 - trunk/include/asm-sparc64/mdesc.h | 1 - trunk/include/asm-sparc64/mman.h | 1 - trunk/include/asm-sparc64/mmu.h | 1 - trunk/include/asm-sparc64/mmu_context.h | 1 - trunk/include/asm-sparc64/mmzone.h | 1 - trunk/include/asm-sparc64/module.h | 1 - trunk/include/asm-sparc64/mostek.h | 1 - trunk/include/asm-sparc64/msgbuf.h | 1 - trunk/include/asm-sparc64/mutex.h | 1 - trunk/include/asm-sparc64/ns87303.h | 1 - trunk/include/asm-sparc64/of_device.h | 1 - trunk/include/asm-sparc64/of_platform.h | 1 - trunk/include/asm-sparc64/openprom.h | 1 - trunk/include/asm-sparc64/openpromio.h | 1 - trunk/include/asm-sparc64/oplib.h | 1 - trunk/include/asm-sparc64/page.h | 1 - trunk/include/asm-sparc64/param.h | 1 - trunk/include/asm-sparc64/parport.h | 1 - trunk/include/asm-sparc64/pci.h | 1 - trunk/include/asm-sparc64/percpu.h | 1 - trunk/include/asm-sparc64/perfctr.h | 1 - trunk/include/asm-sparc64/pgalloc.h | 1 - trunk/include/asm-sparc64/pgtable.h | 1 - trunk/include/asm-sparc64/pil.h | 1 - trunk/include/asm-sparc64/poll.h | 1 - trunk/include/asm-sparc64/posix_types.h | 1 - trunk/include/asm-sparc64/processor.h | 1 - trunk/include/asm-sparc64/prom.h | 1 - trunk/include/asm-sparc64/psrcompat.h | 1 - trunk/include/asm-sparc64/pstate.h | 1 - trunk/include/asm-sparc64/ptrace.h | 1 - trunk/include/asm-sparc64/reboot.h | 1 - trunk/include/asm-sparc64/reg.h | 1 - trunk/include/asm-sparc64/resource.h | 1 - trunk/include/asm-sparc64/rtc.h | 1 - trunk/include/asm-sparc64/rwsem-const.h | 1 - trunk/include/asm-sparc64/rwsem.h | 1 - trunk/include/asm-sparc64/sbus.h | 1 - trunk/include/asm-sparc64/scatterlist.h | 1 - trunk/include/asm-sparc64/scratchpad.h | 1 - trunk/include/asm-sparc64/seccomp.h | 1 - trunk/include/asm-sparc64/sections.h | 1 - trunk/include/asm-sparc64/sembuf.h | 1 - trunk/include/asm-sparc64/setup.h | 1 - trunk/include/asm-sparc64/sfafsr.h | 1 - trunk/include/asm-sparc64/sfp-machine.h | 1 - trunk/include/asm-sparc64/shmbuf.h | 1 - trunk/include/asm-sparc64/shmparam.h | 1 - trunk/include/asm-sparc64/sigcontext.h | 1 - trunk/include/asm-sparc64/siginfo.h | 1 - trunk/include/asm-sparc64/signal.h | 1 - trunk/include/asm-sparc64/smp.h | 1 - trunk/include/asm-sparc64/socket.h | 1 - trunk/include/asm-sparc64/sockios.h | 1 - trunk/include/asm-sparc64/sparsemem.h | 1 - trunk/include/asm-sparc64/spinlock.h | 1 - trunk/include/asm-sparc64/spinlock_types.h | 1 - trunk/include/asm-sparc64/spitfire.h | 1 - trunk/include/asm-sparc64/sstate.h | 1 - trunk/include/asm-sparc64/stacktrace.h | 1 - trunk/include/asm-sparc64/starfire.h | 1 - trunk/include/asm-sparc64/stat.h | 1 - trunk/include/asm-sparc64/statfs.h | 1 - trunk/include/asm-sparc64/string.h | 1 - trunk/include/asm-sparc64/sunbpp.h | 1 - trunk/include/asm-sparc64/syscalls.h | 1 - trunk/include/asm-sparc64/system.h | 1 - trunk/include/asm-sparc64/termbits.h | 1 - trunk/include/asm-sparc64/termios.h | 1 - trunk/include/asm-sparc64/thread_info.h | 1 - trunk/include/asm-sparc64/timer.h | 1 - trunk/include/asm-sparc64/timex.h | 1 - trunk/include/asm-sparc64/tlb.h | 1 - trunk/include/asm-sparc64/tlbflush.h | 1 - trunk/include/asm-sparc64/topology.h | 1 - trunk/include/asm-sparc64/tsb.h | 1 - trunk/include/asm-sparc64/ttable.h | 1 - trunk/include/asm-sparc64/types.h | 1 - trunk/include/asm-sparc64/uaccess.h | 1 - trunk/include/asm-sparc64/uctx.h | 1 - trunk/include/asm-sparc64/unaligned.h | 1 - trunk/include/asm-sparc64/unistd.h | 1 - trunk/include/asm-sparc64/upa.h | 1 - trunk/include/asm-sparc64/user.h | 1 - trunk/include/asm-sparc64/utrap.h | 1 - trunk/include/asm-sparc64/vga.h | 1 - trunk/include/asm-sparc64/vio.h | 1 - trunk/include/asm-sparc64/visasm.h | 1 - trunk/include/asm-sparc64/watchdog.h | 1 - trunk/include/asm-sparc64/xor.h | 1 - trunk/include/linux/sched.h | 12 +- trunk/include/linux/task_io_accounting.h | 17 +- trunk/include/linux/task_io_accounting_ops.h | 48 +- trunk/kernel/tsacct.c | 14 +- trunk/net/dccp/dccp.h | 2 +- trunk/net/dccp/ipv4.c | 9 +- trunk/net/dccp/ipv6.c | 16 +- trunk/net/dccp/output.c | 53 +- trunk/net/dccp/timer.c | 20 +- trunk/net/ipv4/ipcomp.c | 4 +- trunk/net/ipv6/ipcomp6.c | 4 +- 597 files changed, 1389 insertions(+), 1848 deletions(-) delete mode 100644 trunk/Documentation/i2c/upgrading-clients mode change 100644 => 100755 trunk/arch/arm/mach-at91/board-yl-9200.c rename trunk/{include/asm-sparc => arch/sparc/include/asm}/Kbuild (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/agp.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/apb.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/apc.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/asi.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/asmmacro.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/atomic.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/atomic_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/atomic_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/auxio.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/auxio_32.h (97%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/auxio_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/auxvec.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/backoff.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/bbc.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/bitext.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/bitops.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/bitops_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/bitops_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/bpp.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/btfixup.h (99%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/bug.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/bugs.h (87%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/byteorder.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/cache.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/cacheflush.h (64%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/cacheflush_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/cacheflush_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/chafsr.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/checksum.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/checksum_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/checksum_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/chmctrl.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/clock.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/cmt.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/compat.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/compat_signal.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/contregs.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/cpudata.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/cpudata_32.h (89%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/cpudata_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/cputime.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/current.h (96%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/cypress.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/dcr.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/dcu.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/delay.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/delay_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/delay_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/device.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/display7seg.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/div64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/dma-mapping.h (64%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/dma-mapping_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/dma-mapping_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/dma.h (66%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/dma_32.h (99%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/dma_64.h (99%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/ebus.h (66%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/ebus_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/ebus_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/ecc.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/eeprom.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/elf.h (66%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/elf_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/elf_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/emergency-restart.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/envctrl.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/errno.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/estate.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/fb.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/fbio.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/fcntl.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/fhc.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/fixmap.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/floppy.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/floppy_32.h (99%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/floppy_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/fpumacro.h (100%) rename trunk/{include/asm-sparc64 => arch/sparc/include/asm}/ftrace.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/futex.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/futex_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/futex_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/hardirq.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/hardirq_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/hardirq_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/head.h (66%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/head_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/head_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/highmem.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/hugetlb.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/hvtramp.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/hw_irq.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/hypervisor.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/ide.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/idprom.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/intr_queue.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/io-unit.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/io.h (67%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/io_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/io_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/ioctl.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/ioctls.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/iommu.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/iommu_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/iommu_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/ipcbuf.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/ipcbuf_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/ipcbuf_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/irq.h (66%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/irq_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/irq_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/irq_regs.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/irqflags.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/irqflags_32.h (96%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/irqflags_64.h (97%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/jsflash.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/kdebug.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/kdebug_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/kdebug_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/kgdb.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/kmap_types.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/kprobes.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/ldc.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/linkage.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/lmb.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/local.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/lsu.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/machines.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/mbus.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/mc146818rtc.h (64%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/mc146818rtc_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/mc146818rtc_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/mdesc.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/memreg.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/mman.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/mmu.h (66%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/mmu_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/mmu_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/mmu_context.h (64%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/mmu_context_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/mmu_context_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/mmzone.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/module.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/module_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/module_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/mostek.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/mostek_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/mostek_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/mpmbox.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/msgbuf.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/msi.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/mutex.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/mxcc.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/ns87303.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/obio.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/of_device.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/of_platform.h (64%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/of_platform_32.h (91%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/of_platform_64.h (91%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/openprom.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/openprom_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/openprom_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/openpromio.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/oplib.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/oplib_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/oplib_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/page.h (66%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/page_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/page_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/param.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/parport.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/pbm.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/pci.h (66%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/pci_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/pci_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/pcic.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/percpu.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/percpu_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/percpu_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/perfctr.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/pgalloc.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/pgalloc_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/pgalloc_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/pgtable.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/pgtable_32.h (99%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/pgtable_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/pgtsrmmu.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/pgtsun4.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/pgtsun4c.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/pil.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/poll.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/posix_types.h (64%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/posix_types_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/posix_types_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/processor.h (64%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/processor_32.h (99%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/processor_64.h (99%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/prom.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/psr.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/psrcompat.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/pstate.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/ptrace.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/ptrace_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/ptrace_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/reboot.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/reg.h (66%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/reg_32.h (98%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/reg_64.h (97%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/resource.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/ross.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/rtc.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/rwsem-const.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/rwsem.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/sbi.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/sbus.h (66%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/sbus_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/sbus_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/scatterlist.h (64%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/scatterlist_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/scatterlist_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/scratchpad.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/seccomp.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/sections.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/sections_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/sections_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/sembuf.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/setup.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/sfafsr.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/sfp-machine.h (64%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/sfp-machine_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/sfp-machine_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/shmbuf.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/shmparam.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/shmparam_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/shmparam_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/sigcontext.h (64%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/sigcontext_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/sigcontext_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/siginfo.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/siginfo_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/siginfo_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/signal.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/signal_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/signal_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/smp.h (66%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/smp_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/smp_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/smpprim.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/socket.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/sockios.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/sparsemem.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/spinlock.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/spinlock_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/spinlock_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/spinlock_types.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/spitfire.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/sstate.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/stacktrace.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/starfire.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/stat.h (66%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/stat_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/stat_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/statfs.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/statfs_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/statfs_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/string.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/string_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/string_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/sun4paddr.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/sun4prom.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/sunbpp.h (99%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/swift.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/syscalls.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/sysen.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/system.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/system_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/system_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/termbits.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/termios.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/thread_info.h (64%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/thread_info_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/thread_info_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/timer.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/timer_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/timer_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/timex.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/timex_32.h (89%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/timex_64.h (90%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/tlb.h (66%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/tlb_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/tlb_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/tlbflush.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/tlbflush_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/tlbflush_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/topology.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/topology_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/topology_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/traps.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/tsb.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/tsunami.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/ttable.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/turbosparc.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/types.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/uaccess.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/uaccess_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/uaccess_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/uctx.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/unaligned.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/unistd.h (65%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/unistd_32.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/unistd_64.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/upa.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/user.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/utrap.h (97%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/vac-ops.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/vaddrs.h (97%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/vfc_ioctls.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/vga.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/viking.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/vio.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/visasm.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/watchdog.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/winmacro.h (100%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/xor.h (66%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/xor_32.h (99%) rename trunk/{include/asm-sparc => arch/sparc/include/asm}/xor_64.h (98%) delete mode 100644 trunk/include/asm-sparc64/Kbuild delete mode 100644 trunk/include/asm-sparc64/agp.h delete mode 100644 trunk/include/asm-sparc64/apb.h delete mode 100644 trunk/include/asm-sparc64/asi.h delete mode 100644 trunk/include/asm-sparc64/atomic.h delete mode 100644 trunk/include/asm-sparc64/auxio.h delete mode 100644 trunk/include/asm-sparc64/auxvec.h delete mode 100644 trunk/include/asm-sparc64/backoff.h delete mode 100644 trunk/include/asm-sparc64/bbc.h delete mode 100644 trunk/include/asm-sparc64/bitops.h delete mode 100644 trunk/include/asm-sparc64/bpp.h delete mode 100644 trunk/include/asm-sparc64/bug.h delete mode 100644 trunk/include/asm-sparc64/bugs.h delete mode 100644 trunk/include/asm-sparc64/byteorder.h delete mode 100644 trunk/include/asm-sparc64/cache.h delete mode 100644 trunk/include/asm-sparc64/cacheflush.h delete mode 100644 trunk/include/asm-sparc64/chafsr.h delete mode 100644 trunk/include/asm-sparc64/checksum.h delete mode 100644 trunk/include/asm-sparc64/chmctrl.h delete mode 100644 trunk/include/asm-sparc64/cmt.h delete mode 100644 trunk/include/asm-sparc64/compat.h delete mode 100644 trunk/include/asm-sparc64/compat_signal.h delete mode 100644 trunk/include/asm-sparc64/cpudata.h delete mode 100644 trunk/include/asm-sparc64/cputime.h delete mode 100644 trunk/include/asm-sparc64/current.h delete mode 100644 trunk/include/asm-sparc64/dcr.h delete mode 100644 trunk/include/asm-sparc64/dcu.h delete mode 100644 trunk/include/asm-sparc64/delay.h delete mode 100644 trunk/include/asm-sparc64/device.h delete mode 100644 trunk/include/asm-sparc64/display7seg.h delete mode 100644 trunk/include/asm-sparc64/div64.h delete mode 100644 trunk/include/asm-sparc64/dma-mapping.h delete mode 100644 trunk/include/asm-sparc64/dma.h delete mode 100644 trunk/include/asm-sparc64/ebus.h delete mode 100644 trunk/include/asm-sparc64/elf.h delete mode 100644 trunk/include/asm-sparc64/emergency-restart.h delete mode 100644 trunk/include/asm-sparc64/envctrl.h delete mode 100644 trunk/include/asm-sparc64/errno.h delete mode 100644 trunk/include/asm-sparc64/estate.h delete mode 100644 trunk/include/asm-sparc64/fb.h delete mode 100644 trunk/include/asm-sparc64/fbio.h delete mode 100644 trunk/include/asm-sparc64/fcntl.h delete mode 100644 trunk/include/asm-sparc64/fhc.h delete mode 100644 trunk/include/asm-sparc64/floppy.h delete mode 100644 trunk/include/asm-sparc64/fpumacro.h delete mode 100644 trunk/include/asm-sparc64/futex.h delete mode 100644 trunk/include/asm-sparc64/hardirq.h delete mode 100644 trunk/include/asm-sparc64/head.h delete mode 100644 trunk/include/asm-sparc64/hugetlb.h delete mode 100644 trunk/include/asm-sparc64/hvtramp.h delete mode 100644 trunk/include/asm-sparc64/hw_irq.h delete mode 100644 trunk/include/asm-sparc64/hypervisor.h delete mode 100644 trunk/include/asm-sparc64/ide.h delete mode 100644 trunk/include/asm-sparc64/idprom.h delete mode 100644 trunk/include/asm-sparc64/intr_queue.h delete mode 100644 trunk/include/asm-sparc64/io.h delete mode 100644 trunk/include/asm-sparc64/ioctl.h delete mode 100644 trunk/include/asm-sparc64/ioctls.h delete mode 100644 trunk/include/asm-sparc64/iommu.h delete mode 100644 trunk/include/asm-sparc64/ipcbuf.h delete mode 100644 trunk/include/asm-sparc64/irq.h delete mode 100644 trunk/include/asm-sparc64/irq_regs.h delete mode 100644 trunk/include/asm-sparc64/irqflags.h delete mode 100644 trunk/include/asm-sparc64/kdebug.h delete mode 100644 trunk/include/asm-sparc64/kgdb.h delete mode 100644 trunk/include/asm-sparc64/kmap_types.h delete mode 100644 trunk/include/asm-sparc64/kprobes.h delete mode 100644 trunk/include/asm-sparc64/ldc.h delete mode 100644 trunk/include/asm-sparc64/linkage.h delete mode 100644 trunk/include/asm-sparc64/lmb.h delete mode 100644 trunk/include/asm-sparc64/local.h delete mode 100644 trunk/include/asm-sparc64/lsu.h delete mode 100644 trunk/include/asm-sparc64/mc146818rtc.h delete mode 100644 trunk/include/asm-sparc64/mdesc.h delete mode 100644 trunk/include/asm-sparc64/mman.h delete mode 100644 trunk/include/asm-sparc64/mmu.h delete mode 100644 trunk/include/asm-sparc64/mmu_context.h delete mode 100644 trunk/include/asm-sparc64/mmzone.h delete mode 100644 trunk/include/asm-sparc64/module.h delete mode 100644 trunk/include/asm-sparc64/mostek.h delete mode 100644 trunk/include/asm-sparc64/msgbuf.h delete mode 100644 trunk/include/asm-sparc64/mutex.h delete mode 100644 trunk/include/asm-sparc64/ns87303.h delete mode 100644 trunk/include/asm-sparc64/of_device.h delete mode 100644 trunk/include/asm-sparc64/of_platform.h delete mode 100644 trunk/include/asm-sparc64/openprom.h delete mode 100644 trunk/include/asm-sparc64/openpromio.h delete mode 100644 trunk/include/asm-sparc64/oplib.h delete mode 100644 trunk/include/asm-sparc64/page.h delete mode 100644 trunk/include/asm-sparc64/param.h delete mode 100644 trunk/include/asm-sparc64/parport.h delete mode 100644 trunk/include/asm-sparc64/pci.h delete mode 100644 trunk/include/asm-sparc64/percpu.h delete mode 100644 trunk/include/asm-sparc64/perfctr.h delete mode 100644 trunk/include/asm-sparc64/pgalloc.h delete mode 100644 trunk/include/asm-sparc64/pgtable.h delete mode 100644 trunk/include/asm-sparc64/pil.h delete mode 100644 trunk/include/asm-sparc64/poll.h delete mode 100644 trunk/include/asm-sparc64/posix_types.h delete mode 100644 trunk/include/asm-sparc64/processor.h delete mode 100644 trunk/include/asm-sparc64/prom.h delete mode 100644 trunk/include/asm-sparc64/psrcompat.h delete mode 100644 trunk/include/asm-sparc64/pstate.h delete mode 100644 trunk/include/asm-sparc64/ptrace.h delete mode 100644 trunk/include/asm-sparc64/reboot.h delete mode 100644 trunk/include/asm-sparc64/reg.h delete mode 100644 trunk/include/asm-sparc64/resource.h delete mode 100644 trunk/include/asm-sparc64/rtc.h delete mode 100644 trunk/include/asm-sparc64/rwsem-const.h delete mode 100644 trunk/include/asm-sparc64/rwsem.h delete mode 100644 trunk/include/asm-sparc64/sbus.h delete mode 100644 trunk/include/asm-sparc64/scatterlist.h delete mode 100644 trunk/include/asm-sparc64/scratchpad.h delete mode 100644 trunk/include/asm-sparc64/seccomp.h delete mode 100644 trunk/include/asm-sparc64/sections.h delete mode 100644 trunk/include/asm-sparc64/sembuf.h delete mode 100644 trunk/include/asm-sparc64/setup.h delete mode 100644 trunk/include/asm-sparc64/sfafsr.h delete mode 100644 trunk/include/asm-sparc64/sfp-machine.h delete mode 100644 trunk/include/asm-sparc64/shmbuf.h delete mode 100644 trunk/include/asm-sparc64/shmparam.h delete mode 100644 trunk/include/asm-sparc64/sigcontext.h delete mode 100644 trunk/include/asm-sparc64/siginfo.h delete mode 100644 trunk/include/asm-sparc64/signal.h delete mode 100644 trunk/include/asm-sparc64/smp.h delete mode 100644 trunk/include/asm-sparc64/socket.h delete mode 100644 trunk/include/asm-sparc64/sockios.h delete mode 100644 trunk/include/asm-sparc64/sparsemem.h delete mode 100644 trunk/include/asm-sparc64/spinlock.h delete mode 100644 trunk/include/asm-sparc64/spinlock_types.h delete mode 100644 trunk/include/asm-sparc64/spitfire.h delete mode 100644 trunk/include/asm-sparc64/sstate.h delete mode 100644 trunk/include/asm-sparc64/stacktrace.h delete mode 100644 trunk/include/asm-sparc64/starfire.h delete mode 100644 trunk/include/asm-sparc64/stat.h delete mode 100644 trunk/include/asm-sparc64/statfs.h delete mode 100644 trunk/include/asm-sparc64/string.h delete mode 100644 trunk/include/asm-sparc64/sunbpp.h delete mode 100644 trunk/include/asm-sparc64/syscalls.h delete mode 100644 trunk/include/asm-sparc64/system.h delete mode 100644 trunk/include/asm-sparc64/termbits.h delete mode 100644 trunk/include/asm-sparc64/termios.h delete mode 100644 trunk/include/asm-sparc64/thread_info.h delete mode 100644 trunk/include/asm-sparc64/timer.h delete mode 100644 trunk/include/asm-sparc64/timex.h delete mode 100644 trunk/include/asm-sparc64/tlb.h delete mode 100644 trunk/include/asm-sparc64/tlbflush.h delete mode 100644 trunk/include/asm-sparc64/topology.h delete mode 100644 trunk/include/asm-sparc64/tsb.h delete mode 100644 trunk/include/asm-sparc64/ttable.h delete mode 100644 trunk/include/asm-sparc64/types.h delete mode 100644 trunk/include/asm-sparc64/uaccess.h delete mode 100644 trunk/include/asm-sparc64/uctx.h delete mode 100644 trunk/include/asm-sparc64/unaligned.h delete mode 100644 trunk/include/asm-sparc64/unistd.h delete mode 100644 trunk/include/asm-sparc64/upa.h delete mode 100644 trunk/include/asm-sparc64/user.h delete mode 100644 trunk/include/asm-sparc64/utrap.h delete mode 100644 trunk/include/asm-sparc64/vga.h delete mode 100644 trunk/include/asm-sparc64/vio.h delete mode 100644 trunk/include/asm-sparc64/visasm.h delete mode 100644 trunk/include/asm-sparc64/watchdog.h delete mode 100644 trunk/include/asm-sparc64/xor.h diff --git a/[refs] b/[refs] index c16da51907f1..714940dfbf03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f31f3080943c7e3541f07df326f06d598a067d0 +refs/heads/master: a439fe51a1f8eb087c22dd24d69cebae4a3addac diff --git a/trunk/Documentation/SubmittingPatches b/trunk/Documentation/SubmittingPatches index f79ad9ff6031..118ca6e9404f 100644 --- a/trunk/Documentation/SubmittingPatches +++ b/trunk/Documentation/SubmittingPatches @@ -528,33 +528,7 @@ See more details on the proper patch format in the following references. -16) Sending "git pull" requests (from Linus emails) -Please write the git repo address and branch name alone on the same line -so that I can't even by mistake pull from the wrong branch, and so -that a triple-click just selects the whole thing. - -So the proper format is something along the lines of: - - "Please pull from - - git://jdelvare.pck.nerim.net/jdelvare-2.6 i2c-for-linus - - to get these changes:" - -so that I don't have to hunt-and-peck for the address and inevitably -get it wrong (actually, I've only gotten it wrong a few times, and -checking against the diffstat tells me when I get it wrong, but I'm -just a lot more comfortable when I don't have to "look for" the right -thing to pull, and double-check that I have the right branch-name). - - -Please use "git diff -M --stat --summary" to generate the diffstat: -the -M enables rename detection, and the summary enables a summary of -new/deleted or renamed files. - -With rename detection, the statistics are rather different [...] -because git will notice that a fair number of the changes are renames. ----------------------------------- SECTION 2 - HINTS, TIPS, AND TRICKS diff --git a/trunk/Documentation/arm/Interrupts b/trunk/Documentation/arm/Interrupts index c202ed35d7d6..0d3dbf1099bc 100644 --- a/trunk/Documentation/arm/Interrupts +++ b/trunk/Documentation/arm/Interrupts @@ -138,8 +138,14 @@ So, what's changed? Set active the IRQ edge(s)/level. This replaces the SA1111 INTPOL manipulation, and the set_GPIO_IRQ_edge() - function. Type should be one of IRQ_TYPE_xxx defined in - + function. Type should be one of the following: + + #define IRQT_NOEDGE (0) + #define IRQT_RISING (__IRQT_RISEDGE) + #define IRQT_FALLING (__IRQT_FALEDGE) + #define IRQT_BOTHEDGE (__IRQT_RISEDGE|__IRQT_FALEDGE) + #define IRQT_LOW (__IRQT_LOWLVL) + #define IRQT_HIGH (__IRQT_HIGHLVL) 3. set_GPIO_IRQ_edge() is obsolete, and should be replaced by set_irq_type. diff --git a/trunk/Documentation/i2c/upgrading-clients b/trunk/Documentation/i2c/upgrading-clients deleted file mode 100644 index 9a45f9bb6a25..000000000000 --- a/trunk/Documentation/i2c/upgrading-clients +++ /dev/null @@ -1,281 +0,0 @@ -Upgrading I2C Drivers to the new 2.6 Driver Model -================================================= - -Ben Dooks - -Introduction ------------- - -This guide outlines how to alter existing Linux 2.6 client drivers from -the old to the new new binding methods. - - -Example old-style driver ------------------------- - - -struct example_state { - struct i2c_client client; - .... -}; - -static struct i2c_driver example_driver; - -static unsigned short ignore[] = { I2C_CLIENT_END }; -static unsigned short normal_addr[] = { OUR_ADDR, I2C_CLIENT_END }; - -I2C_CLIENT_INSMOD; - -static int example_attach(struct i2c_adapter *adap, int addr, int kind) -{ - struct example_state *state; - struct device *dev = &adap->dev; /* to use for dev_ reports */ - int ret; - - state = kzalloc(sizeof(struct example_state), GFP_KERNEL); - if (state == NULL) { - dev_err(dev, "failed to create our state\n"); - return -ENOMEM; - } - - example->client.addr = addr; - example->client.flags = 0; - example->client.adapter = adap; - - i2c_set_clientdata(&state->i2c_client, state); - strlcpy(client->i2c_client.name, "example", I2C_NAME_SIZE); - - ret = i2c_attach_client(&state->i2c_client); - if (ret < 0) { - dev_err(dev, "failed to attach client\n"); - kfree(state); - return ret; - } - - dev = &state->i2c_client.dev; - - /* rest of the initialisation goes here. */ - - dev_info(dev, "example client created\n"); - - return 0; -} - -static int __devexit example_detach(struct i2c_client *client) -{ - struct example_state *state = i2c_get_clientdata(client); - - i2c_detach_client(client); - kfree(state); - return 0; -} - -static int example_attach_adapter(struct i2c_adapter *adap) -{ - return i2c_probe(adap, &addr_data, example_attach); -} - -static struct i2c_driver example_driver = { - .driver = { - .owner = THIS_MODULE, - .name = "example", - }, - .attach_adapter = example_attach_adapter, - .detach_client = __devexit_p(example_detach), - .suspend = example_suspend, - .resume = example_resume, -}; - - -Updating the client -------------------- - -The new style binding model will check against a list of supported -devices and their associated address supplied by the code registering -the busses. This means that the driver .attach_adapter and -.detach_adapter methods can be removed, along with the addr_data, -as follows: - -- static struct i2c_driver example_driver; - -- static unsigned short ignore[] = { I2C_CLIENT_END }; -- static unsigned short normal_addr[] = { OUR_ADDR, I2C_CLIENT_END }; - -- I2C_CLIENT_INSMOD; - -- static int example_attach_adapter(struct i2c_adapter *adap) -- { -- return i2c_probe(adap, &addr_data, example_attach); -- } - - static struct i2c_driver example_driver = { -- .attach_adapter = example_attach_adapter, -- .detach_client = __devexit_p(example_detach), - } - -Add the probe and remove methods to the i2c_driver, as so: - - static struct i2c_driver example_driver = { -+ .probe = example_probe, -+ .remove = __devexit_p(example_remove), - } - -Change the example_attach method to accept the new parameters -which include the i2c_client that it will be working with: - -- static int example_attach(struct i2c_adapter *adap, int addr, int kind) -+ static int example_probe(struct i2c_client *client, -+ const struct i2c_device_id *id) - -Change the name of example_attach to example_probe to align it with the -i2c_driver entry names. The rest of the probe routine will now need to be -changed as the i2c_client has already been setup for use. - -The necessary client fields have already been setup before -the probe function is called, so the following client setup -can be removed: - -- example->client.addr = addr; -- example->client.flags = 0; -- example->client.adapter = adap; -- -- strlcpy(client->i2c_client.name, "example", I2C_NAME_SIZE); - -The i2c_set_clientdata is now: - -- i2c_set_clientdata(&state->client, state); -+ i2c_set_clientdata(client, state); - -The call to i2c_attach_client is no longer needed, if the probe -routine exits successfully, then the driver will be automatically -attached by the core. Change the probe routine as so: - -- ret = i2c_attach_client(&state->i2c_client); -- if (ret < 0) { -- dev_err(dev, "failed to attach client\n"); -- kfree(state); -- return ret; -- } - - -Remove the storage of 'struct i2c_client' from the 'struct example_state' -as we are provided with the i2c_client in our example_probe. Instead we -store a pointer to it for when it is needed. - -struct example_state { -- struct i2c_client client; -+ struct i2c_client *client; - -the new i2c client as so: - -- struct device *dev = &adap->dev; /* to use for dev_ reports */ -+ struct device *dev = &i2c_client->dev; /* to use for dev_ reports */ - -And remove the change after our client is attached, as the driver no -longer needs to register a new client structure with the core: - -- dev = &state->i2c_client.dev; - -In the probe routine, ensure that the new state has the client stored -in it: - -static int example_probe(struct i2c_client *i2c_client, - const struct i2c_device_id *id) -{ - struct example_state *state; - struct device *dev = &i2c_client->dev; - int ret; - - state = kzalloc(sizeof(struct example_state), GFP_KERNEL); - if (state == NULL) { - dev_err(dev, "failed to create our state\n"); - return -ENOMEM; - } - -+ state->client = i2c_client; - -Update the detach method, by changing the name to _remove and -to delete the i2c_detach_client call. It is possible that you -can also remove the ret variable as it is not not needed for -any of the core functions. - -- static int __devexit example_detach(struct i2c_client *client) -+ static int __devexit example_remove(struct i2c_client *client) -{ - struct example_state *state = i2c_get_clientdata(client); - -- i2c_detach_client(client); - -And finally ensure that we have the correct ID table for the i2c-core -and other utilities: - -+ struct i2c_device_id example_idtable[] = { -+ { "example", 0 }, -+ { } -+}; -+ -+MODULE_DEVICE_TABLE(i2c, example_idtable); - -static struct i2c_driver example_driver = { - .driver = { - .owner = THIS_MODULE, - .name = "example", - }, -+ .id_table = example_ids, - - -Our driver should now look like this: - -struct example_state { - struct i2c_client *client; - .... -}; - -static int example_probe(struct i2c_client *client, - const struct i2c_device_id *id) -{ - struct example_state *state; - struct device *dev = &client->dev; - - state = kzalloc(sizeof(struct example_state), GFP_KERNEL); - if (state == NULL) { - dev_err(dev, "failed to create our state\n"); - return -ENOMEM; - } - - state->client = client; - i2c_set_clientdata(client, state); - - /* rest of the initialisation goes here. */ - - dev_info(dev, "example client created\n"); - - return 0; -} - -static int __devexit example_remove(struct i2c_client *client) -{ - struct example_state *state = i2c_get_clientdata(client); - - kfree(state); - return 0; -} - -static struct i2c_device_id example_idtable[] = { - { "example", 0 }, - { } -}; - -MODULE_DEVICE_TABLE(i2c, example_idtable); - -static struct i2c_driver example_driver = { - .driver = { - .owner = THIS_MODULE, - .name = "example", - }, - .id_table = example_idtable, - .probe = example_probe, - .remove = __devexit_p(example_remove), - .suspend = example_suspend, - .resume = example_resume, -}; diff --git a/trunk/Makefile b/trunk/Makefile index 40f24810116c..baee3d414754 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -206,7 +206,11 @@ ifeq ($(ARCH),x86_64) endif # Where to locate arch specific headers -hdr-arch := $(SRCARCH) +ifeq ($(ARCH),sparc64) + hdr-arch := sparc +else + hdr-arch := $(SRCARCH) +endif KCONFIG_CONFIG ?= .config diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index c8f528284a94..dabb015aa40b 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -314,7 +314,7 @@ config ARCH_IOP32X select PLAT_IOP select PCI select GENERIC_GPIO - select ARCH_REQUIRE_GPIOLIB + select HAVE_GPIO_LIB help Support for Intel's 80219 and IOP32X (XScale) family of processors. @@ -325,7 +325,7 @@ config ARCH_IOP33X select PLAT_IOP select PCI select GENERIC_GPIO - select ARCH_REQUIRE_GPIOLIB + select HAVE_GPIO_LIB help Support for Intel's IOP33X (XScale) family of processors. @@ -418,7 +418,7 @@ config ARCH_MXC select GENERIC_CLOCKEVENTS select ARCH_MTD_XIP select GENERIC_GPIO - select ARCH_REQUIRE_GPIOLIB + select HAVE_GPIO_LIB help Support for Freescale MXC/iMX-based family of processors diff --git a/trunk/arch/arm/Makefile b/trunk/arch/arm/Makefile index 2f0747744236..b20995a82e04 100644 --- a/trunk/arch/arm/Makefile +++ b/trunk/arch/arm/Makefile @@ -67,7 +67,7 @@ tune-$(CONFIG_CPU_ARM720T) :=-mtune=arm7tdmi tune-$(CONFIG_CPU_ARM740T) :=-mtune=arm7tdmi tune-$(CONFIG_CPU_ARM9TDMI) :=-mtune=arm9tdmi tune-$(CONFIG_CPU_ARM940T) :=-mtune=arm9tdmi -tune-$(CONFIG_CPU_ARM946E) :=$(call cc-option,-mtune=arm9e,-mtune=arm9tdmi) +tune-$(CONFIG_CPU_ARM946T) :=$(call cc-option,-mtune=arm9e,-mtune=arm9tdmi) tune-$(CONFIG_CPU_ARM920T) :=-mtune=arm9tdmi tune-$(CONFIG_CPU_ARM922T) :=-mtune=arm9tdmi tune-$(CONFIG_CPU_ARM925T) :=-mtune=arm9tdmi diff --git a/trunk/arch/arm/common/locomo.c b/trunk/arch/arm/common/locomo.c index 85579654d3b7..c3c3a3339049 100644 --- a/trunk/arch/arm/common/locomo.c +++ b/trunk/arch/arm/common/locomo.c @@ -331,17 +331,17 @@ static int locomo_gpio_type(unsigned int irq, unsigned int type) mask = 1 << (irq - LOCOMO_IRQ_GPIO_START); - if (type == IRQ_TYPE_PROBE) { + if (type == IRQT_PROBE) { if ((GPIO_IRQ_rising_edge | GPIO_IRQ_falling_edge) & mask) return 0; - type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING; + type = __IRQT_RISEDGE | __IRQT_FALEDGE; } - if (type & IRQ_TYPE_EDGE_RISING) + if (type & __IRQT_RISEDGE) GPIO_IRQ_rising_edge |= mask; else GPIO_IRQ_rising_edge &= ~mask; - if (type & IRQ_TYPE_EDGE_FALLING) + if (type & __IRQT_FALEDGE) GPIO_IRQ_falling_edge |= mask; else GPIO_IRQ_falling_edge &= ~mask; @@ -473,7 +473,7 @@ static void locomo_setup_irq(struct locomo *lchip) /* * Install handler for IRQ_LOCOMO_HW. */ - set_irq_type(lchip->irq, IRQ_TYPE_EDGE_FALLING); + set_irq_type(lchip->irq, IRQT_FALLING); set_irq_chip_data(lchip->irq, irqbase); set_irq_chained_handler(lchip->irq, locomo_handler); diff --git a/trunk/arch/arm/common/sa1111.c b/trunk/arch/arm/common/sa1111.c index f6d3fdda7067..0a8e1ff2af8a 100644 --- a/trunk/arch/arm/common/sa1111.c +++ b/trunk/arch/arm/common/sa1111.c @@ -241,14 +241,14 @@ static int sa1111_type_lowirq(unsigned int irq, unsigned int flags) void __iomem *mapbase = get_irq_chip_data(irq); unsigned long ip0; - if (flags == IRQ_TYPE_PROBE) + if (flags == IRQT_PROBE) return 0; - if ((!(flags & IRQ_TYPE_EDGE_RISING) ^ !(flags & IRQ_TYPE_EDGE_FALLING)) == 0) + if ((!(flags & __IRQT_RISEDGE) ^ !(flags & __IRQT_FALEDGE)) == 0) return -EINVAL; ip0 = sa1111_readl(mapbase + SA1111_INTPOL0); - if (flags & IRQ_TYPE_EDGE_RISING) + if (flags & __IRQT_RISEDGE) ip0 &= ~mask; else ip0 |= mask; @@ -338,14 +338,14 @@ static int sa1111_type_highirq(unsigned int irq, unsigned int flags) void __iomem *mapbase = get_irq_chip_data(irq); unsigned long ip1; - if (flags == IRQ_TYPE_PROBE) + if (flags == IRQT_PROBE) return 0; - if ((!(flags & IRQ_TYPE_EDGE_RISING) ^ !(flags & IRQ_TYPE_EDGE_FALLING)) == 0) + if ((!(flags & __IRQT_RISEDGE) ^ !(flags & __IRQT_FALEDGE)) == 0) return -EINVAL; ip1 = sa1111_readl(mapbase + SA1111_INTPOL1); - if (flags & IRQ_TYPE_EDGE_RISING) + if (flags & __IRQT_RISEDGE) ip1 &= ~mask; else ip1 |= mask; @@ -427,7 +427,7 @@ static void sa1111_setup_irq(struct sa1111 *sachip) /* * Register SA1111 interrupt */ - set_irq_type(sachip->irq, IRQ_TYPE_EDGE_RISING); + set_irq_type(sachip->irq, IRQT_RISING); set_irq_data(sachip->irq, irqbase); set_irq_chained_handler(sachip->irq, sa1111_irq_handler); } diff --git a/trunk/arch/arm/configs/eseries_pxa_defconfig b/trunk/arch/arm/configs/eseries_pxa_defconfig index 2307587a38a9..493ecee24f94 100644 --- a/trunk/arch/arm/configs/eseries_pxa_defconfig +++ b/trunk/arch/arm/configs/eseries_pxa_defconfig @@ -1,19 +1,15 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.26 -# Sat Jul 26 22:28:46 2008 +# Linux kernel version: 2.6.21-hh17 +# Fri Nov 9 20:23:03 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_GENERIC_GPIO=y CONFIG_GENERIC_TIME=y -CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_MMU=y # CONFIG_NO_IOPORT is not set CONFIG_GENERIC_HARDIRQS=y -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_LOCKDEP_SUPPORT=y CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_PROBE=y @@ -22,90 +18,75 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_ARCH_SUPPORTS_AOUT=y CONFIG_ZONE_DMA=y CONFIG_ARCH_MTD_XIP=y -CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y CONFIG_VECTORS_BASE=0xffff0000 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # -# General setup +# Code maturity level options # CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set CONFIG_SYSVIPC_SYSCTL=y # CONFIG_POSIX_MQUEUE is not set # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set -CONFIG_LOG_BUF_SHIFT=14 -# CONFIG_CGROUPS is not set -# CONFIG_GROUP_SCHED is not set CONFIG_SYSFS_DEPRECATED=y -CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_RELAY is not set -# CONFIG_NAMESPACES is not set -# CONFIG_BLK_DEV_INITRD is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y CONFIG_EMBEDDED=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y -CONFIG_SYSCTL_SYSCALL_CHECK=y # CONFIG_KALLSYMS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y -CONFIG_COMPAT_BRK=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y -CONFIG_ANON_INODES=y CONFIG_EPOLL=y -CONFIG_SIGNALFD=y -CONFIG_TIMERFD=y -CONFIG_EVENTFD=y CONFIG_SHMEM=y -CONFIG_VM_EVENT_COUNTERS=y CONFIG_SLAB=y -# CONFIG_SLUB is not set -# CONFIG_SLOB is not set -# CONFIG_PROFILING is not set -# CONFIG_MARKERS is not set -CONFIG_HAVE_OPROFILE=y -# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set -# CONFIG_HAVE_IOREMAP_PROT is not set -CONFIG_HAVE_KPROBES=y -CONFIG_HAVE_KRETPROBES=y -# CONFIG_HAVE_ARCH_TRACEHOOK is not set -# CONFIG_HAVE_DMA_ATTRS is not set -# CONFIG_USE_GENERIC_SMP_HELPERS is not set -CONFIG_HAVE_CLK=y -CONFIG_PROC_PAGE_MONITOR=y -CONFIG_SLABINFO=y +CONFIG_VM_EVENT_COUNTERS=y CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_KMOD=y + +# +# Block layer +# CONFIG_BLOCK=y # CONFIG_LBD is not set # CONFIG_BLK_DEV_IO_TRACE is not set # CONFIG_LSF is not set -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_BLK_DEV_INTEGRITY is not set # # IO Schedulers @@ -119,7 +100,6 @@ CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="anticipatory" -CONFIG_CLASSIC_RCU=y # # System Type @@ -131,26 +111,21 @@ CONFIG_CLASSIC_RCU=y # CONFIG_ARCH_AT91 is not set # CONFIG_ARCH_CLPS7500 is not set # CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set # CONFIG_ARCH_EBSA110 is not set # CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_FOOTBRIDGE is not set # CONFIG_ARCH_NETX is not set # CONFIG_ARCH_H720X is not set # CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_IOP13XX is not set # CONFIG_ARCH_IOP32X is not set # CONFIG_ARCH_IOP33X is not set -# CONFIG_ARCH_IXP23XX is not set -# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IOP13XX is not set # CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP23XX is not set # CONFIG_ARCH_L7200 is not set -# CONFIG_ARCH_KIRKWOOD is not set -# CONFIG_ARCH_KS8695 is not set # CONFIG_ARCH_NS9XXX is not set -# CONFIG_ARCH_LOKI is not set -# CONFIG_ARCH_MV78XX0 is not set -# CONFIG_ARCH_MXC is not set -# CONFIG_ARCH_ORION5X is not set # CONFIG_ARCH_PNX4008 is not set CONFIG_ARCH_PXA=y # CONFIG_ARCH_RPC is not set @@ -158,48 +133,80 @@ CONFIG_ARCH_PXA=y # CONFIG_ARCH_S3C2410 is not set # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_LH7A40X is not set -# CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_MSM7X00A is not set +# CONFIG_BOARD_IRQ_MAP_SMALL is not set +CONFIG_BOARD_IRQ_MAP_BIG=y +CONFIG_DMABOUNCE=y # -# Intel PXA2xx/PXA3xx Implementations +# Intel PXA2xx Implementations # -# CONFIG_ARCH_GUMSTIX is not set # CONFIG_ARCH_LUBBOCK is not set # CONFIG_MACH_LOGICPD_PXA270 is not set # CONFIG_MACH_MAINSTONE is not set # CONFIG_ARCH_PXA_IDP is not set -# CONFIG_PXA_SHARPSL is not set -CONFIG_ARCH_PXA_ESERIES=y +CONFIG_TOSHIBA_TMIO_OHCI=y +CONFIG_ARCH_ESERIES=y CONFIG_MACH_E330=y -CONFIG_MACH_E350=y CONFIG_MACH_E740=y CONFIG_MACH_E750=y CONFIG_MACH_E400=y CONFIG_MACH_E800=y -# CONFIG_MACH_TRIZEPS4 is not set -# CONFIG_MACH_EM_X270 is not set -# CONFIG_MACH_COLIBRI is not set -# CONFIG_MACH_ZYLONITE is not set -# CONFIG_MACH_LITTLETON is not set -# CONFIG_MACH_TAVOREVB is not set -# CONFIG_MACH_SAAR is not set -# CONFIG_MACH_ARMCORE is not set +CONFIG_E330_LCD=y +CONFIG_E740_LCD=y +CONFIG_E750_LCD=y +CONFIG_E400_LCD=y +CONFIG_E800_LCD=y +CONFIG_ESERIES_UDC=y +CONFIG_E330_TC6387XB=y +CONFIG_E740_T7L66XB=y +CONFIG_E400_T7L66XB=y +CONFIG_E750_E800_TC6393XB=y +CONFIG_E740_PCMCIA=m +CONFIG_E750_PCMCIA=m +CONFIG_E800_PCMCIA=m +# CONFIG_MACH_A620 is not set +# CONFIG_MACH_A716 is not set +# CONFIG_MACH_A730 is not set +# CONFIG_ARCH_H1900 is not set +# CONFIG_ARCH_H2200 is not set +# CONFIG_MACH_H3900 is not set +# CONFIG_MACH_H4000 is not set +# CONFIG_MACH_H4700 is not set +# CONFIG_MACH_HX2750 is not set +# CONFIG_ARCH_H5400 is not set +# CONFIG_MACH_HIMALAYA is not set +# CONFIG_MACH_HTCUNIVERSAL is not set +# CONFIG_MACH_HTCALPINE is not set # CONFIG_MACH_MAGICIAN is not set -# CONFIG_MACH_PCM027 is not set -# CONFIG_ARCH_PXA_PALM is not set -# CONFIG_PXA_EZX is not set +# CONFIG_MACH_HTCAPACHE is not set +# CONFIG_MACH_BLUEANGEL is not set + +# +# HTC_HW6X00 +# +# CONFIG_MACH_HTCBEETLES is not set +# CONFIG_MACH_HW6900 is not set +# CONFIG_MACH_HTCATHENA is not set +# CONFIG_ARCH_AXIMX3 is not set +# CONFIG_ARCH_AXIMX5 is not set +# CONFIG_MACH_X50 is not set +# CONFIG_ARCH_ROVERP1 is not set +# CONFIG_ARCH_ROVERP5P is not set +# CONFIG_MACH_XSCALE_PALMLD is not set +# CONFIG_MACH_T3XSCALE is not set +# CONFIG_MACH_RECON is not set +# CONFIG_MACH_GHI270HG is not set +# CONFIG_MACH_GHI270 is not set +# CONFIG_MACH_LOOXC550 is not set +# CONFIG_PXA_SHARPSL is not set +# CONFIG_MACH_TRIZEPS4 is not set CONFIG_PXA25x=y -# CONFIG_PXA_PWM is not set - -# -# Boot options -# # -# Power management +# Linux As Bootloader # +# CONFIG_LAB is not set # # Processor Type @@ -208,7 +215,6 @@ CONFIG_CPU_32=y CONFIG_CPU_XSCALE=y CONFIG_CPU_32v5=y CONFIG_CPU_ABRT_EV5T=y -CONFIG_CPU_PABRT_NOIFAR=y CONFIG_CPU_CACHE_VIVT=y CONFIG_CPU_TLB_V4WBI=y CONFIG_CPU_CP15=y @@ -226,9 +232,11 @@ CONFIG_XSCALE_PMU=y # # Bus support # -# CONFIG_PCI_SYSCALL is not set -# CONFIG_ARCH_SUPPORTS_MSI is not set -CONFIG_PCCARD=y + +# +# PCCARD (PCMCIA/CardBus) support +# +CONFIG_PCCARD=m # CONFIG_PCMCIA_DEBUG is not set CONFIG_PCMCIA=m CONFIG_PCMCIA_LOAD_CIS=y @@ -237,14 +245,11 @@ CONFIG_PCMCIA_IOCTL=y # # PC-card bridges # +CONFIG_PCMCIA_PXA2XX=m # # Kernel Features # -CONFIG_TICK_ONESHOT=y -# CONFIG_NO_HZ is not set -# CONFIG_HIGH_RES_TIMERS is not set -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y # CONFIG_PREEMPT is not set CONFIG_HZ=100 CONFIG_AEABI=y @@ -257,13 +262,9 @@ CONFIG_FLATMEM_MANUAL=y CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set -# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set -CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4096 # CONFIG_RESOURCES_64BIT is not set CONFIG_ZONE_DMA_FLAG=1 -CONFIG_BOUNCE=y -CONFIG_VIRT_TO_BUS=y CONFIG_ALIGNMENT_TRAP=y # @@ -274,7 +275,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="" # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y -CONFIG_ATAGS_PROC=y +# CONFIG_TXTOFFSET_DELTA is not set # # CPU Frequency scaling @@ -303,12 +304,11 @@ CONFIG_BINFMT_MISC=y # Power management options # CONFIG_PM=y +CONFIG_PM_LEGACY=y # CONFIG_PM_DEBUG is not set -CONFIG_PM_SLEEP=y -CONFIG_SUSPEND=y -CONFIG_SUSPEND_FREEZER=y +# CONFIG_DPM_DEBUG is not set +# CONFIG_PM_SYSFS_DEPRECATED is not set # CONFIG_APM_EMULATION is not set -CONFIG_ARCH_SUSPEND_POSSIBLE=y # # Networking @@ -318,13 +318,13 @@ CONFIG_NET=y # # Networking options # +# CONFIG_NETDEBUG is not set # CONFIG_PACKET is not set CONFIG_UNIX=y CONFIG_XFRM=y # CONFIG_XFRM_USER is not set # CONFIG_XFRM_SUB_POLICY is not set # CONFIG_XFRM_MIGRATE is not set -# CONFIG_XFRM_STATISTICS is not set # CONFIG_NET_KEY is not set CONFIG_INET=y # CONFIG_IP_MULTICAST is not set @@ -339,40 +339,35 @@ CONFIG_IP_FIB_HASH=y # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set -CONFIG_INET_TUNNEL=y +# CONFIG_INET_TUNNEL is not set CONFIG_INET_XFRM_MODE_TRANSPORT=y CONFIG_INET_XFRM_MODE_TUNNEL=y CONFIG_INET_XFRM_MODE_BEET=y -# CONFIG_INET_LRO is not set CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=y -# CONFIG_IPV6_PRIVACY is not set -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IPV6_OPTIMISTIC_DAD is not set -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set -# CONFIG_IPV6_MIP6 is not set +# CONFIG_IPV6 is not set # CONFIG_INET6_XFRM_TUNNEL is not set # CONFIG_INET6_TUNNEL is not set -CONFIG_INET6_XFRM_MODE_TRANSPORT=y -CONFIG_INET6_XFRM_MODE_TUNNEL=y -CONFIG_INET6_XFRM_MODE_BEET=y -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -CONFIG_IPV6_SIT=y -CONFIG_IPV6_NDISC_NODETYPE=y -# CONFIG_IPV6_TUNNEL is not set -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_IPV6_MROUTE is not set # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETFILTER is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# # CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# # CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set @@ -385,6 +380,10 @@ CONFIG_IPV6_NDISC_NODETYPE=y # CONFIG_LAPB is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# # CONFIG_NET_SCHED is not set # @@ -392,74 +391,15 @@ CONFIG_IPV6_NDISC_NODETYPE=y # # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set -# CONFIG_CAN is not set -CONFIG_IRDA=y - -# -# IrDA protocols -# -CONFIG_IRLAN=m -CONFIG_IRCOMM=m -CONFIG_IRDA_ULTRA=y - -# -# IrDA options -# -CONFIG_IRDA_CACHE_LAST_LSAP=y -CONFIG_IRDA_FAST_RR=y -# CONFIG_IRDA_DEBUG is not set - -# -# Infrared-port device drivers -# - -# -# SIR device drivers -# -# CONFIG_IRTTY_SIR is not set - -# -# Dongle support -# -# CONFIG_KINGSUN_DONGLE is not set -# CONFIG_KSDAZZLE_DONGLE is not set -# CONFIG_KS959_DONGLE is not set - -# -# FIR device drivers -# -# CONFIG_USB_IRDA is not set -# CONFIG_SIGMATEL_FIR is not set -CONFIG_PXA_FICP=y -# CONFIG_MCS_FIR is not set +# CONFIG_IRDA is not set # CONFIG_BT is not set -# CONFIG_AF_RXRPC is not set - -# -# Wireless -# -CONFIG_CFG80211=m -CONFIG_NL80211=y -CONFIG_WIRELESS_EXT=y -CONFIG_WIRELESS_EXT_SYSFS=y -CONFIG_MAC80211=m - -# -# Rate control algorithm selection -# -CONFIG_MAC80211_RC_PID=y -CONFIG_MAC80211_RC_DEFAULT_PID=y -CONFIG_MAC80211_RC_DEFAULT="pid" -# CONFIG_MAC80211_MESH is not set -# CONFIG_MAC80211_LEDS is not set -# CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set CONFIG_IEEE80211_CRYPT_WEP=m -CONFIG_IEEE80211_CRYPT_CCMP=m -CONFIG_IEEE80211_CRYPT_TKIP=m -# CONFIG_RFKILL is not set -# CONFIG_NET_9P is not set +# CONFIG_IEEE80211_CRYPT_CCMP is not set +# CONFIG_IEEE80211_CRYPT_TKIP is not set +# CONFIG_IEEE80211_SOFTMAC is not set +CONFIG_WIRELESS_EXT=y # # Device Drivers @@ -468,32 +408,38 @@ CONFIG_IEEE80211_CRYPT_TKIP=m # # Generic Driver Options # -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" # CONFIG_STANDALONE is not set CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y -CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_EXTRA_FIRMWARE="" # CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# # CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# CONFIG_MTD=m # CONFIG_MTD_DEBUG is not set # CONFIG_MTD_CONCAT is not set -# CONFIG_MTD_PARTITIONS is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set # # User Modules And Translation Layers # -# CONFIG_MTD_CHAR is not set -# CONFIG_MTD_BLKDEVS is not set -# CONFIG_MTD_BLOCK is not set +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m # CONFIG_MTD_BLOCK_RO is not set # CONFIG_FTL is not set # CONFIG_NFTL is not set # CONFIG_INFTL is not set # CONFIG_RFD_FTL is not set # CONFIG_SSFDC is not set -# CONFIG_MTD_OOPS is not set # # RAM/ROM/Flash chip drivers @@ -513,6 +459,7 @@ CONFIG_MTD_CFI_I2=y # CONFIG_MTD_RAM is not set # CONFIG_MTD_ROM is not set # CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set # # Mapping drivers for chip access @@ -535,43 +482,82 @@ CONFIG_MTD_CFI_I2=y # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# CONFIG_MTD_NAND=m -# CONFIG_MTD_NAND_VERIFY_WRITE is not set +CONFIG_MTD_NAND_VERIFY_WRITE=y # CONFIG_MTD_NAND_ECC_SMC is not set -# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_H1900 is not set CONFIG_MTD_NAND_IDS=m # CONFIG_MTD_NAND_DISKONCHIP is not set # CONFIG_MTD_NAND_SHARPSL is not set -# CONFIG_MTD_NAND_PLATFORM is not set -# CONFIG_MTD_ALAUDA is not set +# CONFIG_MTD_NAND_NANDSIM is not set + +# +# OneNAND Flash Device Drivers +# # CONFIG_MTD_ONENAND is not set # -# UBI - Unsorted block images +# Parallel port support # -# CONFIG_MTD_UBI is not set # CONFIG_PARPORT is not set -CONFIG_BLK_DEV=y + +# +# Plug and Play support +# +# CONFIG_PNPACPI is not set + +# +# Block devices +# # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=m # CONFIG_BLK_DEV_CRYPTOLOOP is not set # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_UB is not set -# CONFIG_BLK_DEV_RAM is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=6144 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set -CONFIG_MISC_DEVICES=y -# CONFIG_EEPROM_93CX6 is not set -# CONFIG_ENCLOSURE_SERVICES is not set -CONFIG_HAVE_IDE=y -# CONFIG_IDE is not set + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=m +CONFIG_IDE_MAX_HWIFS=4 +CONFIG_BLK_DEV_IDE=m + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_BLK_DEV_IDEDISK=m +# CONFIG_IDEDISK_MULTI_MODE is not set +# CONFIG_BLK_DEV_IDECS is not set +# CONFIG_BLK_DEV_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_BLK_DEV_IDEFLOPPY is not set +# CONFIG_BLK_DEV_IDESCSI is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +# CONFIG_IDE_GENERIC is not set +# CONFIG_IDE_ARM is not set +# CONFIG_BLK_DEV_IDEDMA is not set +# CONFIG_BLK_DEV_HD is not set # # SCSI device support # # CONFIG_RAID_ATTRS is not set CONFIG_SCSI=m -CONFIG_SCSI_DMA=y # CONFIG_SCSI_TGT is not set # CONFIG_SCSI_NETLINK is not set # CONFIG_SCSI_PROC_FS is not set @@ -579,7 +565,7 @@ CONFIG_SCSI_DMA=y # # SCSI support type (disk, tape, CD-ROM) # -CONFIG_BLK_DEV_SD=m +# CONFIG_BLK_DEV_SD is not set # CONFIG_CHR_DEV_ST is not set # CONFIG_CHR_DEV_OSST is not set # CONFIG_BLK_DEV_SR is not set @@ -593,7 +579,6 @@ CONFIG_BLK_DEV_SD=m # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set # CONFIG_SCSI_SCAN_ASYNC is not set -CONFIG_SCSI_WAIT_SCAN=m # # SCSI Transports @@ -601,78 +586,132 @@ CONFIG_SCSI_WAIT_SCAN=m # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set # CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set # CONFIG_SCSI_SAS_LIBSAS is not set -# CONFIG_SCSI_SRP_ATTRS is not set -# CONFIG_SCSI_LOWLEVEL is not set -# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set -# CONFIG_SCSI_DH is not set -CONFIG_ATA=m -# CONFIG_ATA_NONSTANDARD is not set -# CONFIG_SATA_PMP is not set -CONFIG_ATA_SFF=y -# CONFIG_SATA_MV is not set -CONFIG_PATA_PCMCIA=m -# CONFIG_PATA_PLATFORM is not set + +# +# SCSI low-level drivers +# +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_DEBUG is not set + +# +# PCMCIA SCSI adapter support +# +# CONFIG_PCMCIA_AHA152X is not set +# CONFIG_PCMCIA_FDOMAIN is not set +# CONFIG_PCMCIA_NINJA_SCSI is not set +# CONFIG_PCMCIA_QLOGIC is not set +# CONFIG_PCMCIA_SYM53C500 is not set + +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA is not set + +# +# Multi-device support (RAID and LVM) +# # CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Network device support +# CONFIG_NETDEVICES=y # CONFIG_DUMMY is not set # CONFIG_BONDING is not set -# CONFIG_MACVLAN is not set # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set -# CONFIG_VETH is not set + +# +# PHY device support +# + +# +# Ethernet (10 or 100Mbit) +# # CONFIG_NET_ETHERNET is not set -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set # -# Wireless LAN +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y +# CONFIG_NET_WIRELESS_RTNETLINK is not set + +# +# Obsolete Wireless cards support (pre-802.11) +# +# CONFIG_STRIP is not set +# CONFIG_PCMCIA_WAVELAN is not set +# CONFIG_PCMCIA_NETWAVE is not set + +# +# Wireless 802.11 Frequency Hopping cards support # -# CONFIG_WLAN_PRE80211 is not set -CONFIG_WLAN_80211=y # CONFIG_PCMCIA_RAYCS is not set -# CONFIG_LIBERTAS is not set -CONFIG_HERMES=m -CONFIG_PCMCIA_HERMES=m -# CONFIG_PCMCIA_SPECTRUM is not set + +# +# Wireless 802.11b ISA/PCI cards support +# +# CONFIG_HERMES is not set # CONFIG_ATMEL is not set + +# +# Wireless 802.11b Pcmcia/Cardbus cards support +# # CONFIG_AIRO_CS is not set # CONFIG_PCMCIA_WL3501 is not set # CONFIG_USB_ZD1201 is not set -# CONFIG_USB_NET_RNDIS_WLAN is not set -# CONFIG_RTL8187 is not set -# CONFIG_MAC80211_HWSIM is not set -# CONFIG_P54_COMMON is not set -# CONFIG_IWLWIFI_LEDS is not set -# CONFIG_HOSTAP is not set -# CONFIG_B43 is not set -# CONFIG_B43LEGACY is not set -# CONFIG_ZD1211RW is not set -# CONFIG_RT2X00 is not set +CONFIG_HOSTAP=m +# CONFIG_HOSTAP_FIRMWARE is not set +# CONFIG_HOSTAP_CS is not set +# CONFIG_ACX is not set +CONFIG_NET_WIRELESS=y # -# USB Network Adapters +# PCMCIA network device support +# +# CONFIG_NET_PCMCIA is not set + +# +# Wan interfaces # -# CONFIG_USB_CATC is not set -# CONFIG_USB_KAWETH is not set -# CONFIG_USB_PEGASUS is not set -# CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET is not set -CONFIG_NET_PCMCIA=y -# CONFIG_PCMCIA_3C589 is not set -# CONFIG_PCMCIA_3C574 is not set -# CONFIG_PCMCIA_FMVJ18X is not set -CONFIG_PCMCIA_PCNET=m -# CONFIG_PCMCIA_NMCLAN is not set -# CONFIG_PCMCIA_SMC91C92 is not set -# CONFIG_PCMCIA_XIRC2PS is not set -# CONFIG_PCMCIA_AXNET is not set # CONFIG_WAN is not set # CONFIG_PPP is not set # CONFIG_SLIP is not set +# CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# # CONFIG_ISDN is not set # @@ -680,48 +719,38 @@ CONFIG_PCMCIA_PCNET=m # CONFIG_INPUT=y # CONFIG_INPUT_FF_MEMLESS is not set -# CONFIG_INPUT_POLLDEV is not set # # Userland interfaces # # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_TSDEV=m +CONFIG_INPUT_TSDEV_SCREEN_X=240 +CONFIG_INPUT_TSDEV_SCREEN_Y=320 CONFIG_INPUT_EVDEV=m # CONFIG_INPUT_EVBUG is not set +# CONFIG_INPUT_LED_TRIGGER is not set # # Input Device Drivers # -CONFIG_INPUT_KEYBOARD=y -# CONFIG_KEYBOARD_ATKBD is not set -# CONFIG_KEYBOARD_SUNKBD is not set -# CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set -# CONFIG_KEYBOARD_NEWTON is not set -# CONFIG_KEYBOARD_STOWAWAY is not set -CONFIG_KEYBOARD_GPIO=m +# CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set -# CONFIG_INPUT_TABLET is not set CONFIG_INPUT_TOUCHSCREEN=y -# CONFIG_TOUCHSCREEN_FUJITSU is not set # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_ELO is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set -# CONFIG_TOUCHSCREEN_INEXIO is not set # CONFIG_TOUCHSCREEN_MK712 is not set -# CONFIG_TOUCHSCREEN_PENMOUNT is not set -# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set -# CONFIG_TOUCHSCREEN_TOUCHWIN is not set -# CONFIG_TOUCHSCREEN_UCB1400 is not set CONFIG_TOUCHSCREEN_WM97XX=m CONFIG_TOUCHSCREEN_WM9705=y CONFIG_TOUCHSCREEN_WM9712=y CONFIG_TOUCHSCREEN_WM9713=y -# CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE is not set -# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set -# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_UCB1400 is not set # CONFIG_INPUT_MISC is not set # @@ -734,11 +763,9 @@ CONFIG_TOUCHSCREEN_WM9713=y # Character devices # CONFIG_VT=y -CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y # CONFIG_VT_HW_CONSOLE_BINDING is not set -CONFIG_DEVKMEM=y # CONFIG_SERIAL_NONSTANDARD is not set # @@ -750,12 +777,25 @@ CONFIG_DEVKMEM=y # Non-8250 serial port support # # CONFIG_SERIAL_PXA is not set +# CONFIG_RS232_SERIAL is not set CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set + +# +# IPMI +# # CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set CONFIG_HW_RANDOM=m # CONFIG_NVRAM is not set +# CONFIG_SA1100_RTC is not set +# CONFIG_DTLK is not set # CONFIG_R3964 is not set +# CONFIG_TIHTC is not set # # PCMCIA character devices @@ -763,79 +803,117 @@ CONFIG_HW_RANDOM=m # CONFIG_SYNCLINK_CS is not set # CONFIG_CARDMAN_4000 is not set # CONFIG_CARDMAN_4040 is not set -# CONFIG_IPWIRELESS is not set # CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# # CONFIG_TCG_TPM is not set -# CONFIG_I2C is not set -# CONFIG_SPI is not set -CONFIG_ARCH_REQUIRE_GPIOLIB=y -CONFIG_GPIOLIB=y -# CONFIG_GPIO_SYSFS is not set # -# I2C GPIO expanders: +# I2C support # +# CONFIG_I2C is not set # -# PCI GPIO expanders: +# SPI support # +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set # -# SPI GPIO expanders: +# Dallas's 1-wire bus # # CONFIG_W1 is not set -# CONFIG_POWER_SUPPLY is not set + +# +# Hardware Monitoring support +# # CONFIG_HWMON is not set -# CONFIG_WATCHDOG is not set +# CONFIG_HWMON_VID is not set +# CONFIG_POWER_SUPPLY is not set # -# Sonics Silicon Backplane +# L3 serial bus support # -CONFIG_SSB_POSSIBLE=y -# CONFIG_SSB is not set +# CONFIG_L3 is not set + +# +# Misc devices +# + +# +# Multimedia Capabilities Port drivers +# +# CONFIG_ADC is not set + +# +# Compaq/iPAQ Drivers +# + +# +# Compaq/HP iPAQ Drivers +# +# CONFIG_IPAQ_SLEEVE is not set +# CONFIG_SLEEVE_DEBUG is not set # # Multifunction device drivers # -CONFIG_MFD_CORE=y # CONFIG_MFD_SM501 is not set -# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_ASIC2 is not set +# CONFIG_HTC_ASIC3 is not set # CONFIG_HTC_PASIC3 is not set -CONFIG_MFD_TC6393XB=y +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_BBKEYS is not set +# CONFIG_HTC_ASIC3_DS1WM is not set +# CONFIG_SOC_SAMCOP is not set +# CONFIG_SOC_HAMCOP is not set +# CONFIG_SOC_MQ11XX is not set +CONFIG_SOC_T7L66XB=y +# CONFIG_SOC_TC6387XB is not set +CONFIG_SOC_TC6393XB=y +# CONFIG_SOC_TSC2101 is not set +# CONFIG_SOC_TSC2200 is not set # -# Multimedia devices +# LED devices +# +# CONFIG_NEW_LEDS is not set + # +# LED drivers +# + +# +# LED Triggers +# +# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set # -# Multimedia core support +# Multimedia devices # # CONFIG_VIDEO_DEV is not set -# CONFIG_DVB_CORE is not set -# CONFIG_VIDEO_MEDIA is not set # -# Multimedia drivers +# Digital Video Broadcasting Devices # -# CONFIG_DAB is not set +# CONFIG_DVB is not set +# CONFIG_USB_DABUSB is not set # # Graphics support # -# CONFIG_VGASTATE is not set -# CONFIG_VIDEO_OUTPUT_CONTROL is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_BACKLIGHT_CORGI=y CONFIG_FB=y # CONFIG_FIRMWARE_EDID is not set # CONFIG_FB_DDC is not set CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y -# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set -# CONFIG_FB_SYS_FILLRECT is not set -# CONFIG_FB_SYS_COPYAREA is not set -# CONFIG_FB_SYS_IMAGEBLIT is not set -# CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_SYS_FOPS is not set # CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set @@ -845,25 +923,14 @@ CONFIG_FB_CFB_IMAGEBLIT=y # # Frame buffer hardware drivers # +# CONFIG_FB_IMAGEON is not set # CONFIG_FB_S1D13XXX is not set CONFIG_FB_PXA=y -# CONFIG_FB_PXA_SMARTPANEL is not set # CONFIG_FB_PXA_PARAMETERS is not set # CONFIG_FB_MBX is not set CONFIG_FB_W100=y -# CONFIG_FB_AM200EPD is not set # CONFIG_FB_VIRTUAL is not set -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -# CONFIG_LCD_ILI9320 is not set -# CONFIG_LCD_PLATFORM is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_CORGI=y - -# -# Display device support -# -# CONFIG_DISPLAY_SUPPORT is not set +# CONFIG_FB_VSFB is not set # # Console display driver support @@ -871,7 +938,6 @@ CONFIG_BACKLIGHT_CORGI=y # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set CONFIG_FONTS=y # CONFIG_FONT_8x8 is not set @@ -879,13 +945,28 @@ CONFIG_FONTS=y # CONFIG_FONT_6x11 is not set # CONFIG_FONT_7x14 is not set # CONFIG_FONT_PEARL_8x8 is not set -# CONFIG_FONT_ACORN_8x8 is not set -CONFIG_FONT_MINI_4x6=y +CONFIG_FONT_ACORN_8x8=y +# CONFIG_FONT_MINI_4x6 is not set # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set -# CONFIG_LOGO is not set + +# +# Logo configuration +# +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y + +# +# Sound +# CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m @@ -899,75 +980,125 @@ CONFIG_SND_SUPPORT_OLD_API=y CONFIG_SND_VERBOSE_PROCFS=y CONFIG_SND_VERBOSE_PRINTK=y # CONFIG_SND_DEBUG is not set -CONFIG_SND_DRIVERS=y + +# +# Generic devices +# # CONFIG_SND_DUMMY is not set # CONFIG_SND_MTPAV is not set # CONFIG_SND_SERIAL_U16550 is not set # CONFIG_SND_MPU401 is not set -CONFIG_SND_ARM=y + +# +# ALSA ARM devices +# # CONFIG_SND_PXA2XX_AC97 is not set -# CONFIG_SND_USB is not set -# CONFIG_SND_PCMCIA is not set -CONFIG_SND_SOC=m +# CONFIG_SND_RECON is not set + +# +# USB devices +# +# CONFIG_SND_USB_AUDIO is not set + +# +# PCMCIA devices +# +# CONFIG_SND_VXPOCKET is not set +# CONFIG_SND_PDAUDIOCF is not set + +# +# SoC audio support +# CONFIG_SND_SOC_AC97_BUS=y +CONFIG_SND_SOC=m + +# +# SoC Platforms +# + +# +# SoC Audio for the Atmel AT91 +# + +# +# SoC Audio for the Intel PXA2xx +# CONFIG_SND_PXA2XX_SOC=m CONFIG_SND_PXA2XX_SOC_AC97=m -CONFIG_SND_PXA2XX_SOC_E800=m +CONFIG_SND_PXA2XX_SOC_E740_WM9705=m +CONFIG_SND_PXA2XX_SOC_E750_WM9705=m +CONFIG_SND_PXA2XX_SOC_E800_WM9712=m +# CONFIG_SND_PXA2XX_SOC_MAGICIAN is not set +# CONFIG_SND_PXA2XX_SOC_BLUEANGEL is not set +# CONFIG_SND_PXA2XX_SOC_H5000 is not set + +# +# SoC Audio for the Freescale i.MX +# + +# +# SoC Audio for the Samsung S3C24XX +# +# CONFIG_SND_SOC_AC97_CODEC is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8772 is not set +# CONFIG_SND_SOC_WM8971 is not set +# CONFIG_SND_SOC_WM8956 is not set +# CONFIG_SND_SOC_WM8960 is not set +# CONFIG_SND_SOC_WM8976 is not set +# CONFIG_SND_SOC_WM8974 is not set +# CONFIG_SND_SOC_WM8980 is not set +CONFIG_SND_SOC_WM9705=m +# CONFIG_SND_SOC_WM9713 is not set CONFIG_SND_SOC_WM9712=m +# CONFIG_SND_SOC_UDA1380 is not set +# CONFIG_SND_SOC_AK4535 is not set + +# +# Open Sound System +# # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m -CONFIG_HID_SUPPORT=y -CONFIG_HID=y -# CONFIG_HID_DEBUG is not set -# CONFIG_HIDRAW is not set # -# USB Input Devices +# HID Devices # -CONFIG_USB_HID=m -# CONFIG_USB_HIDINPUT_POWERBOOK is not set -# CONFIG_HID_FF is not set -# CONFIG_USB_HIDDEV is not set +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set # -# USB HID Boot Protocol drivers +# USB support # -# CONFIG_USB_KBD is not set -# CONFIG_USB_MOUSE is not set -CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y -# CONFIG_USB_ARCH_HAS_OHCI is not set +CONFIG_USB_ARCH_HAS_OHCI=y # CONFIG_USB_ARCH_HAS_EHCI is not set CONFIG_USB=m -# CONFIG_USB_DEBUG is not set -# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set +CONFIG_USB_DEBUG=y # # Miscellaneous USB options # -# CONFIG_USB_DEVICEFS is not set -CONFIG_USB_DEVICE_CLASS=y -# CONFIG_USB_DYNAMIC_MINORS is not set +CONFIG_USB_DEVICEFS=y +CONFIG_USB_DYNAMIC_MINORS=y # CONFIG_USB_SUSPEND is not set # CONFIG_USB_OTG is not set -# CONFIG_USB_OTG_WHITELIST is not set -# CONFIG_USB_OTG_BLACKLIST_HUB is not set # # USB Host Controller Drivers # -# CONFIG_USB_C67X00_HCD is not set # CONFIG_USB_ISP116X_HCD is not set -# CONFIG_USB_ISP1760_HCD is not set +# CONFIG_USB_OHCI_HCD is not set # CONFIG_USB_SL811_HCD is not set -# CONFIG_USB_R8A66597_HCD is not set # # USB Device Class drivers # # CONFIG_USB_ACM is not set # CONFIG_USB_PRINTER is not set -# CONFIG_USB_WDM is not set # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' @@ -976,19 +1107,68 @@ CONFIG_USB_DEVICE_CLASS=y # # may also be needed; see USB_STORAGE Help for more information # -# CONFIG_USB_STORAGE is not set +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_DPCM is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_LIBUSUAL is not set +# +# USB Input Devices +# +# CONFIG_USB_HID is not set + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +# CONFIG_USB_AIPTEK is not set +# CONFIG_USB_WACOM is not set +# CONFIG_USB_ACECAD is not set +# CONFIG_USB_KBTAB is not set +# CONFIG_USB_POWERMATE is not set +# CONFIG_USB_TOUCHSCREEN is not set +# CONFIG_USB_YEALINK is not set +# CONFIG_USB_XPAD is not set +# CONFIG_USB_ATI_REMOTE is not set +# CONFIG_USB_ATI_REMOTE2 is not set +# CONFIG_USB_KEYSPAN_REMOTE is not set +# CONFIG_USB_APPLETOUCH is not set +# CONFIG_USB_GTCO is not set + # # USB Imaging devices # # CONFIG_USB_MDC800 is not set # CONFIG_USB_MICROTEK is not set -CONFIG_USB_MON=y + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET_MII is not set +# CONFIG_USB_USBNET is not set +# CONFIG_USB_MON is not set # # USB port drivers # + +# +# USB Serial Converter support +# # CONFIG_USB_SERIAL is not set # @@ -1012,57 +1192,56 @@ CONFIG_USB_MON=y # CONFIG_USB_LD is not set # CONFIG_USB_TRANCEVIBRATOR is not set # CONFIG_USB_IOWARRIOR is not set -# CONFIG_USB_ISIGHTFW is not set +# CONFIG_USB_TEST is not set + +# +# USB DSL modem support +# + +# +# USB Gadget Support +# CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG_FILES is not set CONFIG_USB_GADGET_SELECTED=y -# CONFIG_USB_GADGET_AMD5536UDC is not set -# CONFIG_USB_GADGET_ATMEL_USBA is not set -# CONFIG_USB_GADGET_FSL_USB2 is not set # CONFIG_USB_GADGET_NET2280 is not set -CONFIG_USB_GADGET_PXA25X=y -CONFIG_USB_PXA25X=y -CONFIG_USB_PXA25X_SMALL=y -# CONFIG_USB_GADGET_M66592 is not set +CONFIG_USB_GADGET_PXA2XX=y +CONFIG_USB_PXA2XX=y +# CONFIG_USB_PXA2XX_SMALL is not set # CONFIG_USB_GADGET_PXA27X is not set # CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_MQ11XX is not set # CONFIG_USB_GADGET_LH7A40X is not set -# CONFIG_USB_GADGET_OMAP is not set # CONFIG_USB_GADGET_S3C2410 is not set +# CONFIG_USB_GADGET_OMAP is not set # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set # CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=m +CONFIG_USB_ETH=y # CONFIG_USB_ETH_RNDIS is not set # CONFIG_USB_GADGETFS is not set # CONFIG_USB_FILE_STORAGE is not set # CONFIG_USB_G_SERIAL is not set # CONFIG_USB_MIDI_GADGET is not set -# CONFIG_USB_G_PRINTER is not set -# CONFIG_USB_CDC_COMPOSITE is not set -CONFIG_MMC=y -# CONFIG_MMC_DEBUG is not set -CONFIG_MMC_UNSAFE_RESUME=y +# CONFIG_USB_G_CHAR is not set +# CONFIG_USB_PXA2XX_GPIO is not set # -# MMC/SD Card Drivers +# MMC/SD Card support # +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set CONFIG_MMC_BLOCK=y -CONFIG_MMC_BLOCK_BOUNCE=y -# CONFIG_SDIO_UART is not set -# CONFIG_MMC_TEST is not set +# CONFIG_MMC_PXA is not set +CONFIG_MMC_TMIO=y +# CONFIG_MMC_SAMCOP is not set # -# MMC/SD Host Controller Drivers +# Real Time Clock # -# CONFIG_MMC_PXA is not set -# CONFIG_MMC_SDHCI is not set -# CONFIG_NEW_LEDS is not set CONFIG_RTC_LIB=y # CONFIG_RTC_CLASS is not set -# CONFIG_DMADEVICES is not set -# CONFIG_UIO is not set # # File systems @@ -1076,11 +1255,14 @@ CONFIG_EXT2_FS=y # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set # CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set -CONFIG_DNOTIFY=y +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set # CONFIG_FUSE_FS is not set @@ -1110,6 +1292,7 @@ CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y # CONFIG_CONFIGFS_FS is not set # @@ -1122,21 +1305,30 @@ CONFIG_TMPFS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -# CONFIG_JFFS2_FS is not set +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set -# CONFIG_MINIX_FS is not set -# CONFIG_OMFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set -# CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set -CONFIG_NETWORK_FILESYSTEMS=y + +# +# Network File Systems +# CONFIG_NFS_FS=y CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set CONFIG_LOCKD=y CONFIG_LOCKD_V4=y @@ -1149,6 +1341,7 @@ CONFIG_SUNRPC=y # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set # # Partition Types @@ -1170,7 +1363,10 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_SUN_PARTITION is not set # CONFIG_KARMA_PARTITION is not set # CONFIG_EFI_PARTITION is not set -# CONFIG_SYSV68_PARTITION is not set + +# +# Native Language Support +# CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=y @@ -1211,32 +1407,30 @@ CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_KOI8_R is not set # CONFIG_NLS_KOI8_U is not set # CONFIG_NLS_UTF8 is not set + +# +# Distributed Lock Manager +# # CONFIG_DLM is not set +# +# Profiling support +# +# CONFIG_PROFILING is not set + # # Kernel hacking # # CONFIG_PRINTK_TIME is not set -# CONFIG_ENABLE_WARN_DEPRECATED is not set -# CONFIG_ENABLE_MUST_CHECK is not set -CONFIG_FRAME_WARN=1024 +CONFIG_ENABLE_MUST_CHECK=y # CONFIG_MAGIC_SYSRQ is not set # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_KERNEL is not set +CONFIG_LOG_BUF_SHIFT=14 # CONFIG_DEBUG_BUGVERBOSE is not set -# CONFIG_DEBUG_MEMORY_INIT is not set CONFIG_FRAME_POINTER=y -# CONFIG_LATENCYTOP is not set -CONFIG_HAVE_FTRACE=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -# CONFIG_FTRACE is not set -# CONFIG_IRQSOFF_TRACER is not set -# CONFIG_SCHED_TRACER is not set -# CONFIG_CONTEXT_SWITCH_TRACER is not set -# CONFIG_SAMPLES is not set -CONFIG_HAVE_ARCH_KGDB=y # CONFIG_DEBUG_USER is not set # @@ -1244,102 +1438,61 @@ CONFIG_HAVE_ARCH_KGDB=y # # CONFIG_KEYS is not set # CONFIG_SECURITY is not set -# CONFIG_SECURITY_FILE_CAPABILITIES is not set -CONFIG_CRYPTO=y # -# Crypto core or helper +# Cryptographic options # +CONFIG_CRYPTO=y CONFIG_CRYPTO_ALGAPI=m CONFIG_CRYPTO_BLKCIPHER=m CONFIG_CRYPTO_MANAGER=m -# CONFIG_CRYPTO_GF128MUL is not set -# CONFIG_CRYPTO_NULL is not set -# CONFIG_CRYPTO_CRYPTD is not set -# CONFIG_CRYPTO_AUTHENC is not set -# CONFIG_CRYPTO_TEST is not set - -# -# Authenticated Encryption with Associated Data -# -# CONFIG_CRYPTO_CCM is not set -# CONFIG_CRYPTO_GCM is not set -# CONFIG_CRYPTO_SEQIV is not set - -# -# Block modes -# -CONFIG_CRYPTO_CBC=m -# CONFIG_CRYPTO_CTR is not set -# CONFIG_CRYPTO_CTS is not set -CONFIG_CRYPTO_ECB=m -# CONFIG_CRYPTO_LRW is not set -CONFIG_CRYPTO_PCBC=m -# CONFIG_CRYPTO_XTS is not set - -# -# Hash modes -# # CONFIG_CRYPTO_HMAC is not set # CONFIG_CRYPTO_XCBC is not set - -# -# Digest -# -# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_MD4 is not set # CONFIG_CRYPTO_MD5 is not set -CONFIG_CRYPTO_MICHAEL_MIC=m -# CONFIG_CRYPTO_RMD128 is not set -# CONFIG_CRYPTO_RMD160 is not set -# CONFIG_CRYPTO_RMD256 is not set -# CONFIG_CRYPTO_RMD320 is not set # CONFIG_CRYPTO_SHA1 is not set # CONFIG_CRYPTO_SHA256 is not set # CONFIG_CRYPTO_SHA512 is not set -# CONFIG_CRYPTO_TGR192 is not set # CONFIG_CRYPTO_WP512 is not set - -# -# Ciphers -# -CONFIG_CRYPTO_AES=m -# CONFIG_CRYPTO_ANUBIS is not set -CONFIG_CRYPTO_ARC4=m -# CONFIG_CRYPTO_BLOWFISH is not set -# CONFIG_CRYPTO_CAMELLIA is not set -# CONFIG_CRYPTO_CAST5 is not set -# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_GF128MUL is not set +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_PCBC=m +# CONFIG_CRYPTO_LRW is not set # CONFIG_CRYPTO_DES is not set # CONFIG_CRYPTO_FCRYPT is not set -# CONFIG_CRYPTO_KHAZAD is not set -# CONFIG_CRYPTO_SALSA20 is not set -# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_TWOFISH is not set # CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set # CONFIG_CRYPTO_TEA is not set -# CONFIG_CRYPTO_TWOFISH is not set +CONFIG_CRYPTO_ARC4=m +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_TEST is not set # -# Compression +# Hardware crypto devices # -# CONFIG_CRYPTO_DEFLATE is not set -# CONFIG_CRYPTO_LZO is not set -CONFIG_CRYPTO_HW=y # # Library routines # CONFIG_BITREVERSE=y -# CONFIG_GENERIC_FIND_FIRST_BIT is not set -# CONFIG_GENERIC_FIND_NEXT_BIT is not set -CONFIG_CRC_CCITT=y +# CONFIG_CRC_CCITT is not set # CONFIG_CRC16 is not set -# CONFIG_CRC_T10DIF is not set -# CONFIG_CRC_ITU_T is not set CONFIG_CRC32=y -# CONFIG_CRC7 is not set # CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=m +CONFIG_ZLIB_DEFLATE=m CONFIG_PLIST=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y -CONFIG_HAS_DMA=y diff --git a/trunk/arch/arm/mach-at91/board-cap9adk.c b/trunk/arch/arm/mach-at91/board-cap9adk.c index 117cf6c9afce..a1c41d7c0be9 100644 --- a/trunk/arch/arm/mach-at91/board-cap9adk.c +++ b/trunk/arch/arm/mach-at91/board-cap9adk.c @@ -330,10 +330,10 @@ static void __init cap9adk_board_init(void) /* Serial */ at91_add_device_serial(); /* USB Host */ - set_irq_type(AT91CAP9_ID_UHP, IRQ_TYPE_LEVEL_HIGH); + set_irq_type(AT91CAP9_ID_UHP, IRQT_HIGH); at91_add_device_usbh(&cap9adk_usbh_data); /* USB HS */ - set_irq_type(AT91CAP9_ID_UDPHS, IRQ_TYPE_LEVEL_HIGH); + set_irq_type(AT91CAP9_ID_UDPHS, IRQT_HIGH); at91_add_device_usba(&cap9adk_usba_udc_data); /* SPI */ at91_add_device_spi(cap9adk_spi_devices, ARRAY_SIZE(cap9adk_spi_devices)); @@ -350,7 +350,7 @@ static void __init cap9adk_board_init(void) /* I2C */ at91_add_device_i2c(NULL, 0); /* LCD Controller */ - set_irq_type(AT91CAP9_ID_LCDC, IRQ_TYPE_LEVEL_HIGH); + set_irq_type(AT91CAP9_ID_LCDC, IRQT_HIGH); at91_add_device_lcdc(&cap9adk_lcdc_data); /* AC97 */ at91_add_device_ac97(&cap9adk_ac97_data); diff --git a/trunk/arch/arm/mach-at91/board-yl-9200.c b/trunk/arch/arm/mach-at91/board-yl-9200.c old mode 100644 new mode 100755 diff --git a/trunk/arch/arm/mach-at91/irq.c b/trunk/arch/arm/mach-at91/irq.c index ca87587b2b4b..78a5cdb746dc 100644 --- a/trunk/arch/arm/mach-at91/irq.c +++ b/trunk/arch/arm/mach-at91/irq.c @@ -56,19 +56,19 @@ static int at91_aic_set_type(unsigned irq, unsigned type) unsigned int smr, srctype; switch (type) { - case IRQ_TYPE_LEVEL_HIGH: + case IRQT_HIGH: srctype = AT91_AIC_SRCTYPE_HIGH; break; - case IRQ_TYPE_EDGE_RISING: + case IRQT_RISING: srctype = AT91_AIC_SRCTYPE_RISING; break; - case IRQ_TYPE_LEVEL_LOW: + case IRQT_LOW: if ((irq == AT91_ID_FIQ) || is_extern_irq(irq)) /* only supported on external interrupts */ srctype = AT91_AIC_SRCTYPE_LOW; else return -EINVAL; break; - case IRQ_TYPE_EDGE_FALLING: + case IRQT_FALLING: if ((irq == AT91_ID_FIQ) || is_extern_irq(irq)) /* only supported on external interrupts */ srctype = AT91_AIC_SRCTYPE_FALLING; else diff --git a/trunk/arch/arm/mach-ep93xx/core.c b/trunk/arch/arm/mach-ep93xx/core.c index 5fed57608507..1d7bca6aa441 100644 --- a/trunk/arch/arm/mach-ep93xx/core.c +++ b/trunk/arch/arm/mach-ep93xx/core.c @@ -226,7 +226,7 @@ static void ep93xx_gpio_irq_ack(unsigned int irq) int port = line >> 3; int port_mask = 1 << (line & 7); - if ((irq_desc[irq].status & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH) { + if ((irq_desc[irq].status & IRQ_TYPE_SENSE_MASK) == IRQT_BOTHEDGE) { gpio_int_type2[port] ^= port_mask; /* switch edge direction */ ep93xx_gpio_update_int_params(port); } @@ -240,7 +240,7 @@ static void ep93xx_gpio_irq_mask_ack(unsigned int irq) int port = line >> 3; int port_mask = 1 << (line & 7); - if ((irq_desc[irq].status & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH) + if ((irq_desc[irq].status & IRQ_TYPE_SENSE_MASK) == IRQT_BOTHEDGE) gpio_int_type2[port] ^= port_mask; /* switch edge direction */ gpio_int_unmasked[port] &= ~port_mask; @@ -283,27 +283,27 @@ static int ep93xx_gpio_irq_type(unsigned int irq, unsigned int type) gpio_direction_input(gpio); switch (type) { - case IRQ_TYPE_EDGE_RISING: + case IRQT_RISING: gpio_int_type1[port] |= port_mask; gpio_int_type2[port] |= port_mask; desc->handle_irq = handle_edge_irq; break; - case IRQ_TYPE_EDGE_FALLING: + case IRQT_FALLING: gpio_int_type1[port] |= port_mask; gpio_int_type2[port] &= ~port_mask; desc->handle_irq = handle_edge_irq; break; - case IRQ_TYPE_LEVEL_HIGH: + case IRQT_HIGH: gpio_int_type1[port] &= ~port_mask; gpio_int_type2[port] |= port_mask; desc->handle_irq = handle_level_irq; break; - case IRQ_TYPE_LEVEL_LOW: + case IRQT_LOW: gpio_int_type1[port] &= ~port_mask; gpio_int_type2[port] &= ~port_mask; desc->handle_irq = handle_level_irq; break; - case IRQ_TYPE_EDGE_BOTH: + case IRQT_BOTHEDGE: gpio_int_type1[port] |= port_mask; /* set initial polarity based on current input level */ if (gpio_get_value(gpio)) diff --git a/trunk/arch/arm/mach-imx/irq.c b/trunk/arch/arm/mach-imx/irq.c index e1b1f028b930..e6695c4e623b 100644 --- a/trunk/arch/arm/mach-imx/irq.c +++ b/trunk/arch/arm/mach-imx/irq.c @@ -111,7 +111,7 @@ imx_gpio_irq_type(unsigned int _irq, unsigned int type) reg = irq >> 5; bit = 1 << (irq % 32); - if (type == IRQ_TYPE_PROBE) { + if (type == IRQT_PROBE) { /* Don't mess with enabled GPIOs using preconfigured edges or GPIOs set to alternate function during probe */ /* TODO: support probe */ @@ -120,7 +120,7 @@ imx_gpio_irq_type(unsigned int _irq, unsigned int type) // return 0; // if (GAFR(gpio) & (0x3 << (((gpio) & 0xf)*2))) // return 0; -// type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING; +// type = __IRQT_RISEDGE | __IRQT_FALEDGE; } GIUS(reg) |= bit; @@ -128,19 +128,19 @@ imx_gpio_irq_type(unsigned int _irq, unsigned int type) DEBUG_IRQ("setting type of irq %d to ", _irq); - if (type & IRQ_TYPE_EDGE_RISING) { + if (type & __IRQT_RISEDGE) { DEBUG_IRQ("rising edges\n"); irq_type = 0x0; } - if (type & IRQ_TYPE_EDGE_FALLING) { + if (type & __IRQT_FALEDGE) { DEBUG_IRQ("falling edges\n"); irq_type = 0x1; } - if (type & IRQ_TYPE_LEVEL_LOW) { + if (type & __IRQT_LOWLVL) { DEBUG_IRQ("low level\n"); irq_type = 0x3; } - if (type & IRQ_TYPE_LEVEL_HIGH) { + if (type & __IRQT_HIGHLVL) { DEBUG_IRQ("high level\n"); irq_type = 0x2; } diff --git a/trunk/arch/arm/mach-ixp2000/core.c b/trunk/arch/arm/mach-ixp2000/core.c index daf28074134b..81cdc8267206 100644 --- a/trunk/arch/arm/mach-ixp2000/core.c +++ b/trunk/arch/arm/mach-ixp2000/core.c @@ -329,19 +329,19 @@ static int ixp2000_GPIO_irq_type(unsigned int irq, unsigned int type) /* * Then, set the proper trigger type. */ - if (type & IRQ_TYPE_EDGE_FALLING) + if (type & IRQT_FALLING) GPIO_IRQ_falling_edge |= 1 << line; else GPIO_IRQ_falling_edge &= ~(1 << line); - if (type & IRQ_TYPE_EDGE_RISING) + if (type & IRQT_RISING) GPIO_IRQ_rising_edge |= 1 << line; else GPIO_IRQ_rising_edge &= ~(1 << line); - if (type & IRQ_TYPE_LEVEL_LOW) + if (type & IRQT_LOW) GPIO_IRQ_level_low |= 1 << line; else GPIO_IRQ_level_low &= ~(1 << line); - if (type & IRQ_TYPE_LEVEL_HIGH) + if (type & IRQT_HIGH) GPIO_IRQ_level_high |= 1 << line; else GPIO_IRQ_level_high &= ~(1 << line); diff --git a/trunk/arch/arm/mach-ixp23xx/core.c b/trunk/arch/arm/mach-ixp23xx/core.c index df16a4eac490..5fea5a132939 100644 --- a/trunk/arch/arm/mach-ixp23xx/core.c +++ b/trunk/arch/arm/mach-ixp23xx/core.c @@ -126,23 +126,23 @@ static int ixp23xx_irq_set_type(unsigned int irq, unsigned int type) return -EINVAL; switch (type) { - case IRQ_TYPE_EDGE_BOTH: + case IRQT_BOTHEDGE: int_style = IXP23XX_GPIO_STYLE_TRANSITIONAL; irq_type = IXP23XX_IRQ_EDGE; break; - case IRQ_TYPE_EDGE_RISING: + case IRQT_RISING: int_style = IXP23XX_GPIO_STYLE_RISING_EDGE; irq_type = IXP23XX_IRQ_EDGE; break; - case IRQ_TYPE_EDGE_FALLING: + case IRQT_FALLING: int_style = IXP23XX_GPIO_STYLE_FALLING_EDGE; irq_type = IXP23XX_IRQ_EDGE; break; - case IRQ_TYPE_LEVEL_HIGH: + case IRQT_HIGH: int_style = IXP23XX_GPIO_STYLE_ACTIVE_HIGH; irq_type = IXP23XX_IRQ_LEVEL; break; - case IRQ_TYPE_LEVEL_LOW: + case IRQT_LOW: int_style = IXP23XX_GPIO_STYLE_ACTIVE_LOW; irq_type = IXP23XX_IRQ_LEVEL; break; diff --git a/trunk/arch/arm/mach-ixp23xx/roadrunner.c b/trunk/arch/arm/mach-ixp23xx/roadrunner.c index 896ff9f840d9..f0f70ba1e46d 100644 --- a/trunk/arch/arm/mach-ixp23xx/roadrunner.c +++ b/trunk/arch/arm/mach-ixp23xx/roadrunner.c @@ -110,8 +110,8 @@ static int __init roadrunner_map_irq(struct pci_dev *dev, u8 idsel, u8 pin) static void __init roadrunner_pci_preinit(void) { - set_irq_type(IRQ_ROADRUNNER_PCI_INTC, IRQ_TYPE_LEVEL_LOW); - set_irq_type(IRQ_ROADRUNNER_PCI_INTD, IRQ_TYPE_LEVEL_LOW); + set_irq_type(IRQ_ROADRUNNER_PCI_INTC, IRQT_LOW); + set_irq_type(IRQ_ROADRUNNER_PCI_INTD, IRQT_LOW); ixp23xx_pci_preinit(); } diff --git a/trunk/arch/arm/mach-ixp4xx/avila-pci.c b/trunk/arch/arm/mach-ixp4xx/avila-pci.c index c6e044befccb..3f867691d9f2 100644 --- a/trunk/arch/arm/mach-ixp4xx/avila-pci.c +++ b/trunk/arch/arm/mach-ixp4xx/avila-pci.c @@ -30,10 +30,10 @@ void __init avila_pci_preinit(void) { - set_irq_type(IRQ_AVILA_PCI_INTA, IRQ_TYPE_LEVEL_LOW); - set_irq_type(IRQ_AVILA_PCI_INTB, IRQ_TYPE_LEVEL_LOW); - set_irq_type(IRQ_AVILA_PCI_INTC, IRQ_TYPE_LEVEL_LOW); - set_irq_type(IRQ_AVILA_PCI_INTD, IRQ_TYPE_LEVEL_LOW); + set_irq_type(IRQ_AVILA_PCI_INTA, IRQT_LOW); + set_irq_type(IRQ_AVILA_PCI_INTB, IRQT_LOW); + set_irq_type(IRQ_AVILA_PCI_INTC, IRQT_LOW); + set_irq_type(IRQ_AVILA_PCI_INTD, IRQT_LOW); ixp4xx_pci_preinit(); } diff --git a/trunk/arch/arm/mach-ixp4xx/common.c b/trunk/arch/arm/mach-ixp4xx/common.c index 3947c506b4f3..3781b3db9f49 100644 --- a/trunk/arch/arm/mach-ixp4xx/common.c +++ b/trunk/arch/arm/mach-ixp4xx/common.c @@ -142,23 +142,23 @@ static int ixp4xx_set_irq_type(unsigned int irq, unsigned int type) return -EINVAL; switch (type){ - case IRQ_TYPE_EDGE_BOTH: + case IRQT_BOTHEDGE: int_style = IXP4XX_GPIO_STYLE_TRANSITIONAL; irq_type = IXP4XX_IRQ_EDGE; break; - case IRQ_TYPE_EDGE_RISING: + case IRQT_RISING: int_style = IXP4XX_GPIO_STYLE_RISING_EDGE; irq_type = IXP4XX_IRQ_EDGE; break; - case IRQ_TYPE_EDGE_FALLING: + case IRQT_FALLING: int_style = IXP4XX_GPIO_STYLE_FALLING_EDGE; irq_type = IXP4XX_IRQ_EDGE; break; - case IRQ_TYPE_LEVEL_HIGH: + case IRQT_HIGH: int_style = IXP4XX_GPIO_STYLE_ACTIVE_HIGH; irq_type = IXP4XX_IRQ_LEVEL; break; - case IRQ_TYPE_LEVEL_LOW: + case IRQT_LOW: int_style = IXP4XX_GPIO_STYLE_ACTIVE_LOW; irq_type = IXP4XX_IRQ_LEVEL; break; diff --git a/trunk/arch/arm/mach-ixp4xx/coyote-pci.c b/trunk/arch/arm/mach-ixp4xx/coyote-pci.c index be4f4a208b90..ad2e5b97966e 100644 --- a/trunk/arch/arm/mach-ixp4xx/coyote-pci.c +++ b/trunk/arch/arm/mach-ixp4xx/coyote-pci.c @@ -27,8 +27,8 @@ void __init coyote_pci_preinit(void) { - set_irq_type(IRQ_COYOTE_PCI_SLOT0, IRQ_TYPE_LEVEL_LOW); - set_irq_type(IRQ_COYOTE_PCI_SLOT1, IRQ_TYPE_LEVEL_LOW); + set_irq_type(IRQ_COYOTE_PCI_SLOT0, IRQT_LOW); + set_irq_type(IRQ_COYOTE_PCI_SLOT1, IRQT_LOW); ixp4xx_pci_preinit(); } diff --git a/trunk/arch/arm/mach-ixp4xx/dsmg600-pci.c b/trunk/arch/arm/mach-ixp4xx/dsmg600-pci.c index 926d15f885fb..9db7e1f42011 100644 --- a/trunk/arch/arm/mach-ixp4xx/dsmg600-pci.c +++ b/trunk/arch/arm/mach-ixp4xx/dsmg600-pci.c @@ -25,12 +25,12 @@ void __init dsmg600_pci_preinit(void) { - set_irq_type(IRQ_DSMG600_PCI_INTA, IRQ_TYPE_LEVEL_LOW); - set_irq_type(IRQ_DSMG600_PCI_INTB, IRQ_TYPE_LEVEL_LOW); - set_irq_type(IRQ_DSMG600_PCI_INTC, IRQ_TYPE_LEVEL_LOW); - set_irq_type(IRQ_DSMG600_PCI_INTD, IRQ_TYPE_LEVEL_LOW); - set_irq_type(IRQ_DSMG600_PCI_INTE, IRQ_TYPE_LEVEL_LOW); - set_irq_type(IRQ_DSMG600_PCI_INTF, IRQ_TYPE_LEVEL_LOW); + set_irq_type(IRQ_DSMG600_PCI_INTA, IRQT_LOW); + set_irq_type(IRQ_DSMG600_PCI_INTB, IRQT_LOW); + set_irq_type(IRQ_DSMG600_PCI_INTC, IRQT_LOW); + set_irq_type(IRQ_DSMG600_PCI_INTD, IRQT_LOW); + set_irq_type(IRQ_DSMG600_PCI_INTE, IRQT_LOW); + set_irq_type(IRQ_DSMG600_PCI_INTF, IRQT_LOW); ixp4xx_pci_preinit(); } diff --git a/trunk/arch/arm/mach-ixp4xx/fsg-pci.c b/trunk/arch/arm/mach-ixp4xx/fsg-pci.c index ca12a9ca0830..f19f3f6feda1 100644 --- a/trunk/arch/arm/mach-ixp4xx/fsg-pci.c +++ b/trunk/arch/arm/mach-ixp4xx/fsg-pci.c @@ -25,9 +25,9 @@ void __init fsg_pci_preinit(void) { - set_irq_type(IRQ_FSG_PCI_INTA, IRQ_TYPE_LEVEL_LOW); - set_irq_type(IRQ_FSG_PCI_INTB, IRQ_TYPE_LEVEL_LOW); - set_irq_type(IRQ_FSG_PCI_INTC, IRQ_TYPE_LEVEL_LOW); + set_irq_type(IRQ_FSG_PCI_INTA, IRQT_LOW); + set_irq_type(IRQ_FSG_PCI_INTB, IRQT_LOW); + set_irq_type(IRQ_FSG_PCI_INTC, IRQT_LOW); ixp4xx_pci_preinit(); } diff --git a/trunk/arch/arm/mach-ixp4xx/gateway7001-pci.c b/trunk/arch/arm/mach-ixp4xx/gateway7001-pci.c index afd1dc14e597..6abf568322d3 100644 --- a/trunk/arch/arm/mach-ixp4xx/gateway7001-pci.c +++ b/trunk/arch/arm/mach-ixp4xx/gateway7001-pci.c @@ -29,8 +29,8 @@ void __init gateway7001_pci_preinit(void) { - set_irq_type(IRQ_IXP4XX_GPIO10, IRQ_TYPE_LEVEL_LOW); - set_irq_type(IRQ_IXP4XX_GPIO11, IRQ_TYPE_LEVEL_LOW); + set_irq_type(IRQ_IXP4XX_GPIO10, IRQT_LOW); + set_irq_type(IRQ_IXP4XX_GPIO11, IRQT_LOW); ixp4xx_pci_preinit(); } diff --git a/trunk/arch/arm/mach-ixp4xx/gtwx5715-pci.c b/trunk/arch/arm/mach-ixp4xx/gtwx5715-pci.c index 20960704183b..49dec7868807 100644 --- a/trunk/arch/arm/mach-ixp4xx/gtwx5715-pci.c +++ b/trunk/arch/arm/mach-ixp4xx/gtwx5715-pci.c @@ -41,10 +41,10 @@ */ void __init gtwx5715_pci_preinit(void) { - set_irq_type(GTWX5715_PCI_SLOT0_INTA_IRQ, IRQ_TYPE_LEVEL_LOW); - set_irq_type(GTWX5715_PCI_SLOT0_INTB_IRQ, IRQ_TYPE_LEVEL_LOW); - set_irq_type(GTWX5715_PCI_SLOT1_INTA_IRQ, IRQ_TYPE_LEVEL_LOW); - set_irq_type(GTWX5715_PCI_SLOT1_INTB_IRQ, IRQ_TYPE_LEVEL_LOW); + set_irq_type(GTWX5715_PCI_SLOT0_INTA_IRQ, IRQT_LOW); + set_irq_type(GTWX5715_PCI_SLOT0_INTB_IRQ, IRQT_LOW); + set_irq_type(GTWX5715_PCI_SLOT1_INTA_IRQ, IRQT_LOW); + set_irq_type(GTWX5715_PCI_SLOT1_INTB_IRQ, IRQT_LOW); ixp4xx_pci_preinit(); } diff --git a/trunk/arch/arm/mach-ixp4xx/ixdp425-pci.c b/trunk/arch/arm/mach-ixp4xx/ixdp425-pci.c index 7d9bb4d23104..408796004812 100644 --- a/trunk/arch/arm/mach-ixp4xx/ixdp425-pci.c +++ b/trunk/arch/arm/mach-ixp4xx/ixdp425-pci.c @@ -27,10 +27,10 @@ void __init ixdp425_pci_preinit(void) { - set_irq_type(IRQ_IXDP425_PCI_INTA, IRQ_TYPE_LEVEL_LOW); - set_irq_type(IRQ_IXDP425_PCI_INTB, IRQ_TYPE_LEVEL_LOW); - set_irq_type(IRQ_IXDP425_PCI_INTC, IRQ_TYPE_LEVEL_LOW); - set_irq_type(IRQ_IXDP425_PCI_INTD, IRQ_TYPE_LEVEL_LOW); + set_irq_type(IRQ_IXDP425_PCI_INTA, IRQT_LOW); + set_irq_type(IRQ_IXDP425_PCI_INTB, IRQT_LOW); + set_irq_type(IRQ_IXDP425_PCI_INTC, IRQT_LOW); + set_irq_type(IRQ_IXDP425_PCI_INTD, IRQT_LOW); ixp4xx_pci_preinit(); } diff --git a/trunk/arch/arm/mach-ixp4xx/ixdpg425-pci.c b/trunk/arch/arm/mach-ixp4xx/ixdpg425-pci.c index 37d9f2e8f602..d1e75b7dc3b1 100644 --- a/trunk/arch/arm/mach-ixp4xx/ixdpg425-pci.c +++ b/trunk/arch/arm/mach-ixp4xx/ixdpg425-pci.c @@ -25,8 +25,8 @@ void __init ixdpg425_pci_preinit(void) { - set_irq_type(IRQ_IXP4XX_GPIO6, IRQ_TYPE_LEVEL_LOW); - set_irq_type(IRQ_IXP4XX_GPIO7, IRQ_TYPE_LEVEL_LOW); + set_irq_type(IRQ_IXP4XX_GPIO6, IRQT_LOW); + set_irq_type(IRQ_IXP4XX_GPIO7, IRQT_LOW); ixp4xx_pci_preinit(); } diff --git a/trunk/arch/arm/mach-ixp4xx/nas100d-pci.c b/trunk/arch/arm/mach-ixp4xx/nas100d-pci.c index 1088426fdcee..b8ebaf4a9c8e 100644 --- a/trunk/arch/arm/mach-ixp4xx/nas100d-pci.c +++ b/trunk/arch/arm/mach-ixp4xx/nas100d-pci.c @@ -24,11 +24,11 @@ void __init nas100d_pci_preinit(void) { - set_irq_type(IRQ_NAS100D_PCI_INTA, IRQ_TYPE_LEVEL_LOW); - set_irq_type(IRQ_NAS100D_PCI_INTB, IRQ_TYPE_LEVEL_LOW); - set_irq_type(IRQ_NAS100D_PCI_INTC, IRQ_TYPE_LEVEL_LOW); - set_irq_type(IRQ_NAS100D_PCI_INTD, IRQ_TYPE_LEVEL_LOW); - set_irq_type(IRQ_NAS100D_PCI_INTE, IRQ_TYPE_LEVEL_LOW); + set_irq_type(IRQ_NAS100D_PCI_INTA, IRQT_LOW); + set_irq_type(IRQ_NAS100D_PCI_INTB, IRQT_LOW); + set_irq_type(IRQ_NAS100D_PCI_INTC, IRQT_LOW); + set_irq_type(IRQ_NAS100D_PCI_INTD, IRQT_LOW); + set_irq_type(IRQ_NAS100D_PCI_INTE, IRQT_LOW); ixp4xx_pci_preinit(); } diff --git a/trunk/arch/arm/mach-ixp4xx/nslu2-pci.c b/trunk/arch/arm/mach-ixp4xx/nslu2-pci.c index 4429b8448b61..04661fef97f5 100644 --- a/trunk/arch/arm/mach-ixp4xx/nslu2-pci.c +++ b/trunk/arch/arm/mach-ixp4xx/nslu2-pci.c @@ -24,9 +24,9 @@ void __init nslu2_pci_preinit(void) { - set_irq_type(IRQ_NSLU2_PCI_INTA, IRQ_TYPE_LEVEL_LOW); - set_irq_type(IRQ_NSLU2_PCI_INTB, IRQ_TYPE_LEVEL_LOW); - set_irq_type(IRQ_NSLU2_PCI_INTC, IRQ_TYPE_LEVEL_LOW); + set_irq_type(IRQ_NSLU2_PCI_INTA, IRQT_LOW); + set_irq_type(IRQ_NSLU2_PCI_INTB, IRQT_LOW); + set_irq_type(IRQ_NSLU2_PCI_INTC, IRQT_LOW); ixp4xx_pci_preinit(); } diff --git a/trunk/arch/arm/mach-ixp4xx/wg302v2-pci.c b/trunk/arch/arm/mach-ixp4xx/wg302v2-pci.c index 0f00feab67f8..6588f2c758e2 100644 --- a/trunk/arch/arm/mach-ixp4xx/wg302v2-pci.c +++ b/trunk/arch/arm/mach-ixp4xx/wg302v2-pci.c @@ -29,8 +29,8 @@ void __init wg302v2_pci_preinit(void) { - set_irq_type(IRQ_IXP4XX_GPIO8, IRQ_TYPE_LEVEL_LOW); - set_irq_type(IRQ_IXP4XX_GPIO9, IRQ_TYPE_LEVEL_LOW); + set_irq_type(IRQ_IXP4XX_GPIO8, IRQT_LOW); + set_irq_type(IRQ_IXP4XX_GPIO9, IRQT_LOW); ixp4xx_pci_preinit(); } diff --git a/trunk/arch/arm/mach-ks8695/irq.c b/trunk/arch/arm/mach-ks8695/irq.c index 0b06941a1eed..4c3ab43e1046 100644 --- a/trunk/arch/arm/mach-ks8695/irq.c +++ b/trunk/arch/arm/mach-ks8695/irq.c @@ -72,21 +72,21 @@ static int ks8695_irq_set_type(unsigned int irqno, unsigned int type) ctrl = __raw_readl(KS8695_GPIO_VA + KS8695_IOPC); switch (type) { - case IRQ_TYPE_LEVEL_HIGH: + case IRQT_HIGH: mode = IOPC_TM_HIGH; level_triggered = 1; break; - case IRQ_TYPE_LEVEL_LOW: + case IRQT_LOW: mode = IOPC_TM_LOW; level_triggered = 1; break; - case IRQ_TYPE_EDGE_RISING: + case IRQT_RISING: mode = IOPC_TM_RISING; break; - case IRQ_TYPE_EDGE_FALLING: + case IRQT_FALLING: mode = IOPC_TM_FALLING; break; - case IRQ_TYPE_EDGE_BOTH: + case IRQT_BOTHEDGE: mode = IOPC_TM_EDGE; break; default: diff --git a/trunk/arch/arm/mach-netx/generic.c b/trunk/arch/arm/mach-netx/generic.c index 99d4fb19a08a..fd7537f7d11e 100644 --- a/trunk/arch/arm/mach-netx/generic.c +++ b/trunk/arch/arm/mach-netx/generic.c @@ -99,19 +99,19 @@ netx_hif_irq_type(unsigned int _irq, unsigned int type) irq = _irq - NETX_IRQ_HIF_CHAINED(0); - if (type & IRQ_TYPE_EDGE_RISING) { + if (type & __IRQT_RISEDGE) { DEBUG_IRQ("rising edges\n"); val |= (1 << 26) << irq; } - if (type & IRQ_TYPE_EDGE_FALLING) { + if (type & __IRQT_FALEDGE) { DEBUG_IRQ("falling edges\n"); val &= ~((1 << 26) << irq); } - if (type & IRQ_TYPE_LEVEL_LOW) { + if (type & __IRQT_LOWLVL) { DEBUG_IRQ("low level\n"); val &= ~((1 << 26) << irq); } - if (type & IRQ_TYPE_LEVEL_HIGH) { + if (type & __IRQT_HIGHLVL) { DEBUG_IRQ("high level\n"); val |= (1 << 26) << irq; } diff --git a/trunk/arch/arm/mach-omap1/board-osk.c b/trunk/arch/arm/mach-omap1/board-osk.c index 41f94f6fc15c..845c66371ca3 100644 --- a/trunk/arch/arm/mach-omap1/board-osk.c +++ b/trunk/arch/arm/mach-omap1/board-osk.c @@ -288,7 +288,7 @@ static void __init osk_init_cf(void) return; } /* the CF I/O IRQ is really active-low */ - set_irq_type(OMAP_GPIO_IRQ(62), IRQ_TYPE_EDGE_FALLING); + set_irq_type(OMAP_GPIO_IRQ(62), IRQT_FALLING); } static void __init osk_init_irq(void) @@ -483,7 +483,7 @@ static void __init osk_mistral_init(void) omap_cfg_reg(P20_1610_GPIO4); /* PENIRQ */ gpio_request(4, "ts_int"); gpio_direction_input(4); - set_irq_type(OMAP_GPIO_IRQ(4), IRQ_TYPE_EDGE_FALLING); + set_irq_type(OMAP_GPIO_IRQ(4), IRQT_FALLING); spi_register_board_info(mistral_boardinfo, ARRAY_SIZE(mistral_boardinfo)); @@ -494,7 +494,7 @@ static void __init osk_mistral_init(void) int ret = 0; gpio_direction_input(OMAP_MPUIO(2)); - set_irq_type(OMAP_GPIO_IRQ(OMAP_MPUIO(2)), IRQ_TYPE_EDGE_RISING); + set_irq_type(OMAP_GPIO_IRQ(OMAP_MPUIO(2)), IRQT_RISING); #ifdef CONFIG_PM /* share the IRQ in case someone wants to use the * button for more than wakeup from system sleep. diff --git a/trunk/arch/arm/mach-omap1/board-palmz71.c b/trunk/arch/arm/mach-omap1/board-palmz71.c index 34389b63b0ec..e020c2774606 100644 --- a/trunk/arch/arm/mach-omap1/board-palmz71.c +++ b/trunk/arch/arm/mach-omap1/board-palmz71.c @@ -298,11 +298,11 @@ palmz71_powercable(int irq, void *dev_id) if (omap_get_gpio_datain(PALMZ71_USBDETECT_GPIO)) { printk(KERN_INFO "PM: Power cable connected\n"); set_irq_type(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO), - IRQ_TYPE_EDGE_FALLING); + IRQT_FALLING); } else { printk(KERN_INFO "PM: Power cable disconnected\n"); set_irq_type(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO), - IRQ_TYPE_EDGE_RISING); + IRQT_RISING); } return IRQ_HANDLED; } diff --git a/trunk/arch/arm/mach-omap1/board-voiceblue.c b/trunk/arch/arm/mach-omap1/board-voiceblue.c index 8948d45a2769..5c00b3f39cdd 100644 --- a/trunk/arch/arm/mach-omap1/board-voiceblue.c +++ b/trunk/arch/arm/mach-omap1/board-voiceblue.c @@ -186,10 +186,10 @@ static void __init voiceblue_init(void) omap_request_gpio(13); omap_request_gpio(14); omap_request_gpio(15); - set_irq_type(OMAP_GPIO_IRQ(12), IRQ_TYPE_EDGE_RISING); - set_irq_type(OMAP_GPIO_IRQ(13), IRQ_TYPE_EDGE_RISING); - set_irq_type(OMAP_GPIO_IRQ(14), IRQ_TYPE_EDGE_RISING); - set_irq_type(OMAP_GPIO_IRQ(15), IRQ_TYPE_EDGE_RISING); + set_irq_type(OMAP_GPIO_IRQ(12), IRQT_RISING); + set_irq_type(OMAP_GPIO_IRQ(13), IRQT_RISING); + set_irq_type(OMAP_GPIO_IRQ(14), IRQT_RISING); + set_irq_type(OMAP_GPIO_IRQ(15), IRQT_RISING); platform_add_devices(voiceblue_devices, ARRAY_SIZE(voiceblue_devices)); omap_board_config = voiceblue_config; diff --git a/trunk/arch/arm/mach-omap1/fpga.c b/trunk/arch/arm/mach-omap1/fpga.c index d963125ed755..0cf62ef5ecb7 100644 --- a/trunk/arch/arm/mach-omap1/fpga.c +++ b/trunk/arch/arm/mach-omap1/fpga.c @@ -181,7 +181,7 @@ void omap1510_fpga_init_irq(void) */ omap_request_gpio(13); omap_set_gpio_direction(13, 1); - set_irq_type(OMAP_GPIO_IRQ(13), IRQ_TYPE_EDGE_RISING); + set_irq_type(OMAP_GPIO_IRQ(13), IRQT_RISING); set_irq_chained_handler(OMAP1510_INT_FPGA, innovator_fpga_IRQ_demux); } diff --git a/trunk/arch/arm/mach-omap2/board-apollon.c b/trunk/arch/arm/mach-omap2/board-apollon.c index 870b34972d3b..620fa0f120ee 100644 --- a/trunk/arch/arm/mach-omap2/board-apollon.c +++ b/trunk/arch/arm/mach-omap2/board-apollon.c @@ -337,17 +337,17 @@ static void __init apollon_sw_init(void) omap_request_gpio(SW_DOWN_GPIO58); omap_set_gpio_direction(SW_DOWN_GPIO58, 1); - set_irq_type(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), IRQ_TYPE_EDGE_RISING); + set_irq_type(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), IRQT_RISING); if (request_irq(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), &apollon_sw_interrupt, IRQF_SHARED, "enter sw", &apollon_sw_interrupt)) return; - set_irq_type(OMAP_GPIO_IRQ(SW_UP_GPIO17), IRQ_TYPE_EDGE_RISING); + set_irq_type(OMAP_GPIO_IRQ(SW_UP_GPIO17), IRQT_RISING); if (request_irq(OMAP_GPIO_IRQ(SW_UP_GPIO17), &apollon_sw_interrupt, IRQF_SHARED, "up sw", &apollon_sw_interrupt)) return; - set_irq_type(OMAP_GPIO_IRQ(SW_DOWN_GPIO58), IRQ_TYPE_EDGE_RISING); + set_irq_type(OMAP_GPIO_IRQ(SW_DOWN_GPIO58), IRQT_RISING); if (request_irq(OMAP_GPIO_IRQ(SW_DOWN_GPIO58), &apollon_sw_interrupt, IRQF_SHARED, "down sw", &apollon_sw_interrupt)) diff --git a/trunk/arch/arm/mach-orion5x/db88f5281-setup.c b/trunk/arch/arm/mach-orion5x/db88f5281-setup.c index 40a0bee4fbb3..88405e74e5e3 100644 --- a/trunk/arch/arm/mach-orion5x/db88f5281-setup.c +++ b/trunk/arch/arm/mach-orion5x/db88f5281-setup.c @@ -213,7 +213,7 @@ void __init db88f5281_pci_preinit(void) pin = DB88F5281_PCI_SLOT0_IRQ_PIN; if (gpio_request(pin, "PCI Int1") == 0) { if (gpio_direction_input(pin) == 0) { - set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW); + set_irq_type(gpio_to_irq(pin), IRQT_LOW); } else { printk(KERN_ERR "db88f5281_pci_preinit faield to " "set_irq_type pin %d\n", pin); @@ -226,7 +226,7 @@ void __init db88f5281_pci_preinit(void) pin = DB88F5281_PCI_SLOT1_SLOT2_IRQ_PIN; if (gpio_request(pin, "PCI Int2") == 0) { if (gpio_direction_input(pin) == 0) { - set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW); + set_irq_type(gpio_to_irq(pin), IRQT_LOW); } else { printk(KERN_ERR "db88f5281_pci_preinit faield " "to set_irq_type pin %d\n", pin); diff --git a/trunk/arch/arm/mach-orion5x/irq.c b/trunk/arch/arm/mach-orion5x/irq.c index 9ae3f6dc7839..e2a0084ab4a3 100644 --- a/trunk/arch/arm/mach-orion5x/irq.c +++ b/trunk/arch/arm/mach-orion5x/irq.c @@ -91,27 +91,27 @@ static int orion5x_gpio_set_irq_type(u32 irq, u32 type) desc = irq_desc + irq; switch (type) { - case IRQ_TYPE_LEVEL_HIGH: + case IRQT_HIGH: desc->handle_irq = handle_level_irq; desc->status |= IRQ_LEVEL; orion5x_clrbits(GPIO_IN_POL, (1 << pin)); break; - case IRQ_TYPE_LEVEL_LOW: + case IRQT_LOW: desc->handle_irq = handle_level_irq; desc->status |= IRQ_LEVEL; orion5x_setbits(GPIO_IN_POL, (1 << pin)); break; - case IRQ_TYPE_EDGE_RISING: + case IRQT_RISING: desc->handle_irq = handle_edge_irq; desc->status &= ~IRQ_LEVEL; orion5x_clrbits(GPIO_IN_POL, (1 << pin)); break; - case IRQ_TYPE_EDGE_FALLING: + case IRQT_FALLING: desc->handle_irq = handle_edge_irq; desc->status &= ~IRQ_LEVEL; orion5x_setbits(GPIO_IN_POL, (1 << pin)); break; - case IRQ_TYPE_EDGE_BOTH: + case IRQT_BOTHEDGE: desc->handle_irq = handle_edge_irq; desc->status &= ~IRQ_LEVEL; /* @@ -156,7 +156,7 @@ static void orion5x_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) if (cause & (1 << pin)) { irq = gpio_to_irq(pin); desc = irq_desc + irq; - if ((desc->status & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH) { + if ((desc->status & IRQ_TYPE_SENSE_MASK) == IRQT_BOTHEDGE) { /* Swap polarity (race with GPIO line) */ u32 polarity = readl(GPIO_IN_POL); polarity ^= 1 << pin; diff --git a/trunk/arch/arm/mach-orion5x/rd88f5182-setup.c b/trunk/arch/arm/mach-orion5x/rd88f5182-setup.c index 2a46d27209c1..10ae62864269 100644 --- a/trunk/arch/arm/mach-orion5x/rd88f5182-setup.c +++ b/trunk/arch/arm/mach-orion5x/rd88f5182-setup.c @@ -148,7 +148,7 @@ void __init rd88f5182_pci_preinit(void) pin = RD88F5182_PCI_SLOT0_IRQ_A_PIN; if (gpio_request(pin, "PCI IntA") == 0) { if (gpio_direction_input(pin) == 0) { - set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW); + set_irq_type(gpio_to_irq(pin), IRQT_LOW); } else { printk(KERN_ERR "rd88f5182_pci_preinit faield to " "set_irq_type pin %d\n", pin); @@ -161,7 +161,7 @@ void __init rd88f5182_pci_preinit(void) pin = RD88F5182_PCI_SLOT0_IRQ_B_PIN; if (gpio_request(pin, "PCI IntB") == 0) { if (gpio_direction_input(pin) == 0) { - set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW); + set_irq_type(gpio_to_irq(pin), IRQT_LOW); } else { printk(KERN_ERR "rd88f5182_pci_preinit faield to " "set_irq_type pin %d\n", pin); diff --git a/trunk/arch/arm/mach-orion5x/ts209-setup.c b/trunk/arch/arm/mach-orion5x/ts209-setup.c index f270ada2def9..a9cef9703d5b 100644 --- a/trunk/arch/arm/mach-orion5x/ts209-setup.c +++ b/trunk/arch/arm/mach-orion5x/ts209-setup.c @@ -117,7 +117,7 @@ void __init qnap_ts209_pci_preinit(void) pin = QNAP_TS209_PCI_SLOT0_IRQ_PIN; if (gpio_request(pin, "PCI Int1") == 0) { if (gpio_direction_input(pin) == 0) { - set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW); + set_irq_type(gpio_to_irq(pin), IRQT_LOW); } else { printk(KERN_ERR "qnap_ts209_pci_preinit failed to " "set_irq_type pin %d\n", pin); @@ -131,7 +131,7 @@ void __init qnap_ts209_pci_preinit(void) pin = QNAP_TS209_PCI_SLOT1_IRQ_PIN; if (gpio_request(pin, "PCI Int2") == 0) { if (gpio_direction_input(pin) == 0) { - set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW); + set_irq_type(gpio_to_irq(pin), IRQT_LOW); } else { printk(KERN_ERR "qnap_ts209_pci_preinit failed " "to set_irq_type pin %d\n", pin); diff --git a/trunk/arch/arm/mach-pnx4008/irq.c b/trunk/arch/arm/mach-pnx4008/irq.c index 5ed67e1947a8..968d0b027597 100644 --- a/trunk/arch/arm/mach-pnx4008/irq.c +++ b/trunk/arch/arm/mach-pnx4008/irq.c @@ -56,28 +56,28 @@ static void pnx4008_mask_ack_irq(unsigned int irq) static int pnx4008_set_irq_type(unsigned int irq, unsigned int type) { switch (type) { - case IRQ_TYPE_EDGE_RISING: + case IRQT_RISING: __raw_writel(__raw_readl(INTC_ATR(irq)) | INTC_BIT(irq), INTC_ATR(irq)); /*edge sensitive */ __raw_writel(__raw_readl(INTC_APR(irq)) | INTC_BIT(irq), INTC_APR(irq)); /*rising edge */ set_irq_handler(irq, handle_edge_irq); break; - case IRQ_TYPE_EDGE_FALLING: + case IRQT_FALLING: __raw_writel(__raw_readl(INTC_ATR(irq)) | INTC_BIT(irq), INTC_ATR(irq)); /*edge sensitive */ __raw_writel(__raw_readl(INTC_APR(irq)) & ~INTC_BIT(irq), INTC_APR(irq)); /*falling edge */ set_irq_handler(irq, handle_edge_irq); break; - case IRQ_TYPE_LEVEL_LOW: + case IRQT_LOW: __raw_writel(__raw_readl(INTC_ATR(irq)) & ~INTC_BIT(irq), INTC_ATR(irq)); /*level sensitive */ __raw_writel(__raw_readl(INTC_APR(irq)) & ~INTC_BIT(irq), INTC_APR(irq)); /*low level */ set_irq_handler(irq, handle_level_irq); break; - case IRQ_TYPE_LEVEL_HIGH: + case IRQT_HIGH: __raw_writel(__raw_readl(INTC_ATR(irq)) & ~INTC_BIT(irq), INTC_ATR(irq)); /*level sensitive */ __raw_writel(__raw_readl(INTC_APR(irq)) | INTC_BIT(irq), INTC_APR(irq)); /* high level */ set_irq_handler(irq, handle_level_irq); break; - /* IRQ_TYPE_EDGE_BOTH is not supported */ + /* IRQT_BOTHEDGE is not supported */ default: printk(KERN_ERR "PNX4008 IRQ: Unsupported irq type %d\n", type); return -1; diff --git a/trunk/arch/arm/mach-pxa/cm-x270-pci.c b/trunk/arch/arm/mach-pxa/cm-x270-pci.c index 31f5bd411ced..bcf0cde6ccc9 100644 --- a/trunk/arch/arm/mach-pxa/cm-x270-pci.c +++ b/trunk/arch/arm/mach-pxa/cm-x270-pci.c @@ -71,7 +71,7 @@ void __cmx270_pci_init_irq(int irq_gpio) cmx270_it8152_irq_gpio = irq_gpio; - set_irq_type(gpio_to_irq(irq_gpio), IRQ_TYPE_EDGE_RISING); + set_irq_type(gpio_to_irq(irq_gpio), IRQT_RISING); set_irq_chained_handler(gpio_to_irq(irq_gpio), cmx270_it8152_irq_demux); } diff --git a/trunk/arch/arm/mach-pxa/lpd270.c b/trunk/arch/arm/mach-pxa/lpd270.c index 8d1ab54e7b20..cc1c4fa06145 100644 --- a/trunk/arch/arm/mach-pxa/lpd270.c +++ b/trunk/arch/arm/mach-pxa/lpd270.c @@ -113,7 +113,7 @@ static void __init lpd270_init_irq(void) set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); } set_irq_chained_handler(IRQ_GPIO(0), lpd270_irq_handler); - set_irq_type(IRQ_GPIO(0), IRQ_TYPE_EDGE_FALLING); + set_irq_type(IRQ_GPIO(0), IRQT_FALLING); } diff --git a/trunk/arch/arm/mach-pxa/lubbock.c b/trunk/arch/arm/mach-pxa/lubbock.c index af7375bb46a4..ac26423cd20c 100644 --- a/trunk/arch/arm/mach-pxa/lubbock.c +++ b/trunk/arch/arm/mach-pxa/lubbock.c @@ -152,7 +152,7 @@ static void __init lubbock_init_irq(void) } set_irq_chained_handler(IRQ_GPIO(0), lubbock_irq_handler); - set_irq_type(IRQ_GPIO(0), IRQ_TYPE_EDGE_FALLING); + set_irq_type(IRQ_GPIO(0), IRQT_FALLING); } #ifdef CONFIG_PM diff --git a/trunk/arch/arm/mach-pxa/mainstone.c b/trunk/arch/arm/mach-pxa/mainstone.c index c8e38b5ff1c4..851ec2d9b699 100644 --- a/trunk/arch/arm/mach-pxa/mainstone.c +++ b/trunk/arch/arm/mach-pxa/mainstone.c @@ -191,7 +191,7 @@ static void __init mainstone_init_irq(void) MST_INTSETCLR = 0; set_irq_chained_handler(IRQ_GPIO(0), mainstone_irq_handler); - set_irq_type(IRQ_GPIO(0), IRQ_TYPE_EDGE_FALLING); + set_irq_type(IRQ_GPIO(0), IRQT_FALLING); } #ifdef CONFIG_PM diff --git a/trunk/arch/arm/mach-pxa/sharpsl_pm.c b/trunk/arch/arm/mach-pxa/sharpsl_pm.c index 23e9b9283301..34cd585075b0 100644 --- a/trunk/arch/arm/mach-pxa/sharpsl_pm.c +++ b/trunk/arch/arm/mach-pxa/sharpsl_pm.c @@ -146,18 +146,18 @@ void sharpsl_pm_pxa_init(void) if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_acin), sharpsl_ac_isr, IRQF_DISABLED, "AC Input Detect", sharpsl_ac_isr)) { dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_acin)); } - else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_acin),IRQ_TYPE_EDGE_BOTH); + else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_acin),IRQT_BOTHEDGE); if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batlock), sharpsl_fatal_isr, IRQF_DISABLED, "Battery Cover", sharpsl_fatal_isr)) { dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_batlock)); } - else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batlock),IRQ_TYPE_EDGE_FALLING); + else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batlock),IRQT_FALLING); if (sharpsl_pm.machinfo->gpio_fatal) { if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_fatal), sharpsl_fatal_isr, IRQF_DISABLED, "Fatal Battery", sharpsl_fatal_isr)) { dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_fatal)); } - else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_fatal),IRQ_TYPE_EDGE_FALLING); + else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_fatal),IRQT_FALLING); } if (sharpsl_pm.machinfo->batfull_irq) @@ -166,7 +166,7 @@ void sharpsl_pm_pxa_init(void) if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull), sharpsl_chrg_full_isr, IRQF_DISABLED, "CO", sharpsl_chrg_full_isr)) { dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull)); } - else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull),IRQ_TYPE_EDGE_RISING); + else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull),IRQT_RISING); } } diff --git a/trunk/arch/arm/mach-pxa/trizeps4.c b/trunk/arch/arm/mach-pxa/trizeps4.c index 12811b7aea07..dee7bf36f013 100644 --- a/trunk/arch/arm/mach-pxa/trizeps4.c +++ b/trunk/arch/arm/mach-pxa/trizeps4.c @@ -122,7 +122,7 @@ static struct resource dm9000_resources[] = { [2] = { .start = TRIZEPS4_ETH_IRQ, .end = TRIZEPS4_ETH_IRQ, - .flags = (IORESOURCE_IRQ | IRQ_TYPE_EDGE_RISING), + .flags = (IORESOURCE_IRQ | IRQT_RISING), }, }; diff --git a/trunk/arch/arm/mach-sa1100/cerf.c b/trunk/arch/arm/mach-sa1100/cerf.c index 56d3ee01baae..31afe50d7cd5 100644 --- a/trunk/arch/arm/mach-sa1100/cerf.c +++ b/trunk/arch/arm/mach-sa1100/cerf.c @@ -96,7 +96,7 @@ static struct resource cerf_flash_resource = { static void __init cerf_init_irq(void) { sa1100_init_irq(); - set_irq_type(CERF_ETH_IRQ, IRQ_TYPE_EDGE_RISING); + set_irq_type(CERF_ETH_IRQ, IRQT_RISING); } static struct map_desc cerf_io_desc[] __initdata = { diff --git a/trunk/arch/arm/mach-sa1100/h3600.c b/trunk/arch/arm/mach-sa1100/h3600.c index b34ff42bbd75..8473c37b77d6 100644 --- a/trunk/arch/arm/mach-sa1100/h3600.c +++ b/trunk/arch/arm/mach-sa1100/h3600.c @@ -834,7 +834,7 @@ static void __init h3800_init_irq(void) set_irq_chip(irq, &h3800_gpio_irqchip); } #endif - set_irq_type(IRQ_GPIO_H3800_ASIC, IRQ_TYPE_EDGE_RISING); + set_irq_type(IRQ_GPIO_H3800_ASIC, IRQT_RISING); set_irq_chained_handler(IRQ_GPIO_H3800_ASIC, h3800_IRQ_demux); } diff --git a/trunk/arch/arm/mach-sa1100/irq.c b/trunk/arch/arm/mach-sa1100/irq.c index c5e438b12ec7..fa0403af7eec 100644 --- a/trunk/arch/arm/mach-sa1100/irq.c +++ b/trunk/arch/arm/mach-sa1100/irq.c @@ -46,17 +46,17 @@ static int sa1100_gpio_type(unsigned int irq, unsigned int type) else mask = GPIO11_27_MASK(irq); - if (type == IRQ_TYPE_PROBE) { + if (type == IRQT_PROBE) { if ((GPIO_IRQ_rising_edge | GPIO_IRQ_falling_edge) & mask) return 0; - type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING; + type = __IRQT_RISEDGE | __IRQT_FALEDGE; } - if (type & IRQ_TYPE_EDGE_RISING) { + if (type & __IRQT_RISEDGE) { GPIO_IRQ_rising_edge |= mask; } else GPIO_IRQ_rising_edge &= ~mask; - if (type & IRQ_TYPE_EDGE_FALLING) { + if (type & __IRQT_FALEDGE) { GPIO_IRQ_falling_edge |= mask; } else GPIO_IRQ_falling_edge &= ~mask; diff --git a/trunk/arch/arm/mach-sa1100/neponset.c b/trunk/arch/arm/mach-sa1100/neponset.c index 967a48454f6b..9f1ed1509301 100644 --- a/trunk/arch/arm/mach-sa1100/neponset.c +++ b/trunk/arch/arm/mach-sa1100/neponset.c @@ -151,7 +151,7 @@ static int __devinit neponset_probe(struct platform_device *dev) /* * Install handler for GPIO25. */ - set_irq_type(IRQ_GPIO25, IRQ_TYPE_EDGE_RISING); + set_irq_type(IRQ_GPIO25, IRQT_RISING); set_irq_chained_handler(IRQ_GPIO25, neponset_irq_handler); /* diff --git a/trunk/arch/arm/mach-sa1100/pleb.c b/trunk/arch/arm/mach-sa1100/pleb.c index 69a71f11625e..c7bf7e0038f0 100644 --- a/trunk/arch/arm/mach-sa1100/pleb.c +++ b/trunk/arch/arm/mach-sa1100/pleb.c @@ -143,7 +143,7 @@ static void __init pleb_map_io(void) GPDR &= ~GPIO_ETH0_IRQ; - set_irq_type(GPIO_ETH0_IRQ, IRQ_TYPE_EDGE_FALLING); + set_irq_type(GPIO_ETH0_IRQ, IRQT_FALLING); } MACHINE_START(PLEB, "PLEB") diff --git a/trunk/arch/arm/mm/fault-armv.c b/trunk/arch/arm/mm/fault-armv.c index a8ec97b4752e..fbfa26058442 100644 --- a/trunk/arch/arm/mm/fault-armv.c +++ b/trunk/arch/arm/mm/fault-armv.c @@ -37,7 +37,7 @@ static int adjust_pte(struct vm_area_struct *vma, unsigned long address) pgd_t *pgd; pmd_t *pmd; pte_t *pte, entry; - int ret; + int ret = 0; pgd = pgd_offset(vma->vm_mm, address); if (pgd_none(*pgd)) @@ -54,20 +54,16 @@ static int adjust_pte(struct vm_area_struct *vma, unsigned long address) pte = pte_offset_map(pmd, address); entry = *pte; - /* - * If this page is present, it's actually being shared. - */ - ret = pte_present(entry); - /* * If this page isn't present, or is already setup to * fault (ie, is old), we can safely ignore any issues. */ - if (ret && pte_val(entry) & shared_pte_mask) { + if (pte_present(entry) && pte_val(entry) & shared_pte_mask) { flush_cache_page(vma, address, pte_pfn(entry)); pte_val(entry) &= ~shared_pte_mask; set_pte_at(vma->vm_mm, address, pte, entry); flush_tlb_page(vma, address); + ret = 1; } pte_unmap(pte); return ret; diff --git a/trunk/arch/arm/plat-mxc/gpio.c b/trunk/arch/arm/plat-mxc/gpio.c index 318b268f938e..4a7736717d86 100644 --- a/trunk/arch/arm/plat-mxc/gpio.c +++ b/trunk/arch/arm/plat-mxc/gpio.c @@ -73,19 +73,19 @@ static int gpio_set_irq_type(u32 irq, u32 type) void __iomem *reg = port->base; switch (type) { - case IRQ_TYPE_EDGE_RISING: + case IRQT_RISING: edge = GPIO_INT_RISE_EDGE; break; - case IRQ_TYPE_EDGE_FALLING: + case IRQT_FALLING: edge = GPIO_INT_FALL_EDGE; break; - case IRQ_TYPE_LEVEL_LOW: + case IRQT_LOW: edge = GPIO_INT_LOW_LEV; break; - case IRQ_TYPE_LEVEL_HIGH: + case IRQT_HIGH: edge = GPIO_INT_HIGH_LEV; break; - default: /* this includes IRQ_TYPE_EDGE_BOTH */ + default: /* this includes IRQT_BOTHEDGE */ return -EINVAL; } diff --git a/trunk/arch/arm/plat-omap/gpio.c b/trunk/arch/arm/plat-omap/gpio.c index 63e094342ef6..d8e9c2c3f0f6 100644 --- a/trunk/arch/arm/plat-omap/gpio.c +++ b/trunk/arch/arm/plat-omap/gpio.c @@ -517,13 +517,13 @@ static inline void set_24xx_gpio_triggering(struct gpio_bank *bank, int gpio, u32 gpio_bit = 1 << gpio; MOD_REG_BIT(OMAP24XX_GPIO_LEVELDETECT0, gpio_bit, - trigger & IRQ_TYPE_LEVEL_LOW); + trigger & __IRQT_LOWLVL); MOD_REG_BIT(OMAP24XX_GPIO_LEVELDETECT1, gpio_bit, - trigger & IRQ_TYPE_LEVEL_HIGH); + trigger & __IRQT_HIGHLVL); MOD_REG_BIT(OMAP24XX_GPIO_RISINGDETECT, gpio_bit, - trigger & IRQ_TYPE_EDGE_RISING); + trigger & __IRQT_RISEDGE); MOD_REG_BIT(OMAP24XX_GPIO_FALLINGDETECT, gpio_bit, - trigger & IRQ_TYPE_EDGE_FALLING); + trigger & __IRQT_FALEDGE); if (likely(!(bank->non_wakeup_gpios & gpio_bit))) { if (trigger != 0) @@ -555,9 +555,9 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger) case METHOD_MPUIO: reg += OMAP_MPUIO_GPIO_INT_EDGE; l = __raw_readl(reg); - if (trigger & IRQ_TYPE_EDGE_RISING) + if (trigger & __IRQT_RISEDGE) l |= 1 << gpio; - else if (trigger & IRQ_TYPE_EDGE_FALLING) + else if (trigger & __IRQT_FALEDGE) l &= ~(1 << gpio); else goto bad; @@ -567,9 +567,9 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger) case METHOD_GPIO_1510: reg += OMAP1510_GPIO_INT_CONTROL; l = __raw_readl(reg); - if (trigger & IRQ_TYPE_EDGE_RISING) + if (trigger & __IRQT_RISEDGE) l |= 1 << gpio; - else if (trigger & IRQ_TYPE_EDGE_FALLING) + else if (trigger & __IRQT_FALEDGE) l &= ~(1 << gpio); else goto bad; @@ -584,9 +584,9 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger) gpio &= 0x07; l = __raw_readl(reg); l &= ~(3 << (gpio << 1)); - if (trigger & IRQ_TYPE_EDGE_RISING) + if (trigger & __IRQT_RISEDGE) l |= 2 << (gpio << 1); - if (trigger & IRQ_TYPE_EDGE_FALLING) + if (trigger & __IRQT_FALEDGE) l |= 1 << (gpio << 1); if (trigger) /* Enable wake-up during idle for dynamic tick */ @@ -599,9 +599,9 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger) case METHOD_GPIO_730: reg += OMAP730_GPIO_INT_CONTROL; l = __raw_readl(reg); - if (trigger & IRQ_TYPE_EDGE_RISING) + if (trigger & __IRQT_RISEDGE) l |= 1 << gpio; - else if (trigger & IRQ_TYPE_EDGE_FALLING) + else if (trigger & __IRQT_FALEDGE) l &= ~(1 << gpio); else goto bad; @@ -887,7 +887,7 @@ static void _reset_gpio(struct gpio_bank *bank, int gpio) _set_gpio_direction(bank, get_gpio_index(gpio), 1); _set_gpio_irqenable(bank, gpio, 0); _clear_gpio_irqstatus(bank, gpio); - _set_gpio_triggering(bank, get_gpio_index(gpio), IRQ_TYPE_NONE); + _set_gpio_triggering(bank, get_gpio_index(gpio), IRQT_NOEDGE); } /* Use disable_irq_wake() and enable_irq_wake() functions from drivers */ @@ -924,7 +924,7 @@ int omap_request_gpio(int gpio) /* Set trigger to none. You need to enable the desired trigger with * request_irq() or set_irq_type(). */ - _set_gpio_triggering(bank, get_gpio_index(gpio), IRQ_TYPE_NONE); + _set_gpio_triggering(bank, get_gpio_index(gpio), IRQT_NOEDGE); #ifdef CONFIG_ARCH_OMAP15XX if (bank->method == METHOD_GPIO_1510) { diff --git a/trunk/arch/arm/plat-s3c24xx/Kconfig b/trunk/arch/arm/plat-s3c24xx/Kconfig index 0af3872fb763..5e28c217b8c2 100644 --- a/trunk/arch/arm/plat-s3c24xx/Kconfig +++ b/trunk/arch/arm/plat-s3c24xx/Kconfig @@ -9,7 +9,7 @@ config PLAT_S3C24XX depends on ARCH_S3C2410 default y if ARCH_S3C2410 select NO_IOPORT - select ARCH_REQUIRE_GPIOLIB + select HAVE_GPIO_LIB help Base platform code for any Samsung S3C24XX device diff --git a/trunk/arch/arm/plat-s3c24xx/irq.c b/trunk/arch/arm/plat-s3c24xx/irq.c index 001436c04b13..ae2c5d7efc9d 100644 --- a/trunk/arch/arm/plat-s3c24xx/irq.c +++ b/trunk/arch/arm/plat-s3c24xx/irq.c @@ -292,27 +292,27 @@ s3c_irqext_type(unsigned int irq, unsigned int type) /* Set the external interrupt to pointed trigger type */ switch (type) { - case IRQ_TYPE_NONE: + case IRQT_NOEDGE: printk(KERN_WARNING "No edge setting!\n"); break; - case IRQ_TYPE_EDGE_RISING: + case IRQT_RISING: newvalue = S3C2410_EXTINT_RISEEDGE; break; - case IRQ_TYPE_EDGE_FALLING: + case IRQT_FALLING: newvalue = S3C2410_EXTINT_FALLEDGE; break; - case IRQ_TYPE_EDGE_BOTH: + case IRQT_BOTHEDGE: newvalue = S3C2410_EXTINT_BOTHEDGE; break; - case IRQ_TYPE_LEVEL_LOW: + case IRQT_LOW: newvalue = S3C2410_EXTINT_LOWLEV; break; - case IRQ_TYPE_LEVEL_HIGH: + case IRQT_HIGH: newvalue = S3C2410_EXTINT_HILEV; break; diff --git a/trunk/include/asm-sparc/Kbuild b/trunk/arch/sparc/include/asm/Kbuild similarity index 100% rename from trunk/include/asm-sparc/Kbuild rename to trunk/arch/sparc/include/asm/Kbuild diff --git a/trunk/include/asm-sparc/agp.h b/trunk/arch/sparc/include/asm/agp.h similarity index 100% rename from trunk/include/asm-sparc/agp.h rename to trunk/arch/sparc/include/asm/agp.h diff --git a/trunk/include/asm-sparc/apb.h b/trunk/arch/sparc/include/asm/apb.h similarity index 100% rename from trunk/include/asm-sparc/apb.h rename to trunk/arch/sparc/include/asm/apb.h diff --git a/trunk/include/asm-sparc/apc.h b/trunk/arch/sparc/include/asm/apc.h similarity index 100% rename from trunk/include/asm-sparc/apc.h rename to trunk/arch/sparc/include/asm/apc.h diff --git a/trunk/include/asm-sparc/asi.h b/trunk/arch/sparc/include/asm/asi.h similarity index 100% rename from trunk/include/asm-sparc/asi.h rename to trunk/arch/sparc/include/asm/asi.h diff --git a/trunk/include/asm-sparc/asmmacro.h b/trunk/arch/sparc/include/asm/asmmacro.h similarity index 100% rename from trunk/include/asm-sparc/asmmacro.h rename to trunk/arch/sparc/include/asm/asmmacro.h diff --git a/trunk/include/asm-sparc/atomic.h b/trunk/arch/sparc/include/asm/atomic.h similarity index 65% rename from trunk/include/asm-sparc/atomic.h rename to trunk/arch/sparc/include/asm/atomic.h index 66d8166ec1d7..8ff83d8cc33f 100644 --- a/trunk/include/asm-sparc/atomic.h +++ b/trunk/arch/sparc/include/asm/atomic.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_ATOMIC_H #define ___ASM_SPARC_ATOMIC_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/atomic_32.h b/trunk/arch/sparc/include/asm/atomic_32.h similarity index 100% rename from trunk/include/asm-sparc/atomic_32.h rename to trunk/arch/sparc/include/asm/atomic_32.h diff --git a/trunk/include/asm-sparc/atomic_64.h b/trunk/arch/sparc/include/asm/atomic_64.h similarity index 100% rename from trunk/include/asm-sparc/atomic_64.h rename to trunk/arch/sparc/include/asm/atomic_64.h diff --git a/trunk/include/asm-sparc/auxio.h b/trunk/arch/sparc/include/asm/auxio.h similarity index 65% rename from trunk/include/asm-sparc/auxio.h rename to trunk/arch/sparc/include/asm/auxio.h index 24c6f3c0f577..13dc67f03011 100644 --- a/trunk/include/asm-sparc/auxio.h +++ b/trunk/arch/sparc/include/asm/auxio.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_AUXIO_H #define ___ASM_SPARC_AUXIO_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/auxio_32.h b/trunk/arch/sparc/include/asm/auxio_32.h similarity index 97% rename from trunk/include/asm-sparc/auxio_32.h rename to trunk/arch/sparc/include/asm/auxio_32.h index 4db8f23db20f..e03e088be95f 100644 --- a/trunk/include/asm-sparc/auxio_32.h +++ b/trunk/arch/sparc/include/asm/auxio_32.h @@ -36,7 +36,7 @@ * understand the hardware you are querying! */ extern void set_auxio(unsigned char bits_on, unsigned char bits_off); -extern unsigned char get_auxio(void); /* .../asm-sparc/floppy.h */ +extern unsigned char get_auxio(void); /* .../asm/floppy.h */ /* * The following routines are provided for driver-compatibility diff --git a/trunk/include/asm-sparc/auxio_64.h b/trunk/arch/sparc/include/asm/auxio_64.h similarity index 100% rename from trunk/include/asm-sparc/auxio_64.h rename to trunk/arch/sparc/include/asm/auxio_64.h diff --git a/trunk/include/asm-sparc/auxvec.h b/trunk/arch/sparc/include/asm/auxvec.h similarity index 100% rename from trunk/include/asm-sparc/auxvec.h rename to trunk/arch/sparc/include/asm/auxvec.h diff --git a/trunk/include/asm-sparc/backoff.h b/trunk/arch/sparc/include/asm/backoff.h similarity index 100% rename from trunk/include/asm-sparc/backoff.h rename to trunk/arch/sparc/include/asm/backoff.h diff --git a/trunk/include/asm-sparc/bbc.h b/trunk/arch/sparc/include/asm/bbc.h similarity index 100% rename from trunk/include/asm-sparc/bbc.h rename to trunk/arch/sparc/include/asm/bbc.h diff --git a/trunk/include/asm-sparc/bitext.h b/trunk/arch/sparc/include/asm/bitext.h similarity index 100% rename from trunk/include/asm-sparc/bitext.h rename to trunk/arch/sparc/include/asm/bitext.h diff --git a/trunk/include/asm-sparc/bitops.h b/trunk/arch/sparc/include/asm/bitops.h similarity index 65% rename from trunk/include/asm-sparc/bitops.h rename to trunk/arch/sparc/include/asm/bitops.h index 1a2949d0193f..b1edd94bd64f 100644 --- a/trunk/include/asm-sparc/bitops.h +++ b/trunk/arch/sparc/include/asm/bitops.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_BITOPS_H #define ___ASM_SPARC_BITOPS_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/bitops_32.h b/trunk/arch/sparc/include/asm/bitops_32.h similarity index 100% rename from trunk/include/asm-sparc/bitops_32.h rename to trunk/arch/sparc/include/asm/bitops_32.h diff --git a/trunk/include/asm-sparc/bitops_64.h b/trunk/arch/sparc/include/asm/bitops_64.h similarity index 100% rename from trunk/include/asm-sparc/bitops_64.h rename to trunk/arch/sparc/include/asm/bitops_64.h diff --git a/trunk/include/asm-sparc/bpp.h b/trunk/arch/sparc/include/asm/bpp.h similarity index 100% rename from trunk/include/asm-sparc/bpp.h rename to trunk/arch/sparc/include/asm/bpp.h diff --git a/trunk/include/asm-sparc/btfixup.h b/trunk/arch/sparc/include/asm/btfixup.h similarity index 99% rename from trunk/include/asm-sparc/btfixup.h rename to trunk/arch/sparc/include/asm/btfixup.h index 08277e6fb4cd..797722cf69f2 100644 --- a/trunk/include/asm-sparc/btfixup.h +++ b/trunk/arch/sparc/include/asm/btfixup.h @@ -1,5 +1,5 @@ /* - * asm-sparc/btfixup.h: Macros for boot time linking. + * asm/btfixup.h: Macros for boot time linking. * * Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) */ diff --git a/trunk/include/asm-sparc/bug.h b/trunk/arch/sparc/include/asm/bug.h similarity index 100% rename from trunk/include/asm-sparc/bug.h rename to trunk/arch/sparc/include/asm/bug.h diff --git a/trunk/include/asm-sparc/bugs.h b/trunk/arch/sparc/include/asm/bugs.h similarity index 87% rename from trunk/include/asm-sparc/bugs.h rename to trunk/arch/sparc/include/asm/bugs.h index 2dfc07bc8e54..e179bc12f64a 100644 --- a/trunk/include/asm-sparc/bugs.h +++ b/trunk/arch/sparc/include/asm/bugs.h @@ -1,4 +1,4 @@ -/* include/asm-sparc/bugs.h: Sparc probes for various bugs. +/* include/asm/bugs.h: Sparc probes for various bugs. * * Copyright (C) 1996, 2007 David S. Miller (davem@davemloft.net) */ diff --git a/trunk/include/asm-sparc/byteorder.h b/trunk/arch/sparc/include/asm/byteorder.h similarity index 100% rename from trunk/include/asm-sparc/byteorder.h rename to trunk/arch/sparc/include/asm/byteorder.h diff --git a/trunk/include/asm-sparc/cache.h b/trunk/arch/sparc/include/asm/cache.h similarity index 100% rename from trunk/include/asm-sparc/cache.h rename to trunk/arch/sparc/include/asm/cache.h diff --git a/trunk/include/asm-sparc/cacheflush.h b/trunk/arch/sparc/include/asm/cacheflush.h similarity index 64% rename from trunk/include/asm-sparc/cacheflush.h rename to trunk/arch/sparc/include/asm/cacheflush.h index 2b6a37957c2d..049168087b19 100644 --- a/trunk/include/asm-sparc/cacheflush.h +++ b/trunk/arch/sparc/include/asm/cacheflush.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_CACHEFLUSH_H #define ___ASM_SPARC_CACHEFLUSH_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/cacheflush_32.h b/trunk/arch/sparc/include/asm/cacheflush_32.h similarity index 100% rename from trunk/include/asm-sparc/cacheflush_32.h rename to trunk/arch/sparc/include/asm/cacheflush_32.h diff --git a/trunk/include/asm-sparc/cacheflush_64.h b/trunk/arch/sparc/include/asm/cacheflush_64.h similarity index 100% rename from trunk/include/asm-sparc/cacheflush_64.h rename to trunk/arch/sparc/include/asm/cacheflush_64.h diff --git a/trunk/include/asm-sparc/chafsr.h b/trunk/arch/sparc/include/asm/chafsr.h similarity index 100% rename from trunk/include/asm-sparc/chafsr.h rename to trunk/arch/sparc/include/asm/chafsr.h diff --git a/trunk/include/asm-sparc/checksum.h b/trunk/arch/sparc/include/asm/checksum.h similarity index 65% rename from trunk/include/asm-sparc/checksum.h rename to trunk/arch/sparc/include/asm/checksum.h index 4e3553d4f6e1..7ac0d7497bc5 100644 --- a/trunk/include/asm-sparc/checksum.h +++ b/trunk/arch/sparc/include/asm/checksum.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_CHECKSUM_H #define ___ASM_SPARC_CHECKSUM_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/checksum_32.h b/trunk/arch/sparc/include/asm/checksum_32.h similarity index 100% rename from trunk/include/asm-sparc/checksum_32.h rename to trunk/arch/sparc/include/asm/checksum_32.h diff --git a/trunk/include/asm-sparc/checksum_64.h b/trunk/arch/sparc/include/asm/checksum_64.h similarity index 100% rename from trunk/include/asm-sparc/checksum_64.h rename to trunk/arch/sparc/include/asm/checksum_64.h diff --git a/trunk/include/asm-sparc/chmctrl.h b/trunk/arch/sparc/include/asm/chmctrl.h similarity index 100% rename from trunk/include/asm-sparc/chmctrl.h rename to trunk/arch/sparc/include/asm/chmctrl.h diff --git a/trunk/include/asm-sparc/clock.h b/trunk/arch/sparc/include/asm/clock.h similarity index 100% rename from trunk/include/asm-sparc/clock.h rename to trunk/arch/sparc/include/asm/clock.h diff --git a/trunk/include/asm-sparc/cmt.h b/trunk/arch/sparc/include/asm/cmt.h similarity index 100% rename from trunk/include/asm-sparc/cmt.h rename to trunk/arch/sparc/include/asm/cmt.h diff --git a/trunk/include/asm-sparc/compat.h b/trunk/arch/sparc/include/asm/compat.h similarity index 100% rename from trunk/include/asm-sparc/compat.h rename to trunk/arch/sparc/include/asm/compat.h diff --git a/trunk/include/asm-sparc/compat_signal.h b/trunk/arch/sparc/include/asm/compat_signal.h similarity index 100% rename from trunk/include/asm-sparc/compat_signal.h rename to trunk/arch/sparc/include/asm/compat_signal.h diff --git a/trunk/include/asm-sparc/contregs.h b/trunk/arch/sparc/include/asm/contregs.h similarity index 100% rename from trunk/include/asm-sparc/contregs.h rename to trunk/arch/sparc/include/asm/contregs.h diff --git a/trunk/include/asm-sparc/cpudata.h b/trunk/arch/sparc/include/asm/cpudata.h similarity index 65% rename from trunk/include/asm-sparc/cpudata.h rename to trunk/arch/sparc/include/asm/cpudata.h index b76fac0c8d8f..b5976de7cacd 100644 --- a/trunk/include/asm-sparc/cpudata.h +++ b/trunk/arch/sparc/include/asm/cpudata.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_CPUDATA_H #define ___ASM_SPARC_CPUDATA_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/cpudata_32.h b/trunk/arch/sparc/include/asm/cpudata_32.h similarity index 89% rename from trunk/include/asm-sparc/cpudata_32.h rename to trunk/arch/sparc/include/asm/cpudata_32.h index a2c4d51d36c4..31d48a0e32c7 100644 --- a/trunk/include/asm-sparc/cpudata_32.h +++ b/trunk/arch/sparc/include/asm/cpudata_32.h @@ -2,7 +2,7 @@ * * Copyright (C) 2004 Keith M Wesolowski (wesolows@foobazco.org) * - * Based on include/asm-sparc64/cpudata.h and Linux 2.4 smp.h + * Based on include/asm/cpudata.h and Linux 2.4 smp.h * both (C) David S. Miller. */ diff --git a/trunk/include/asm-sparc/cpudata_64.h b/trunk/arch/sparc/include/asm/cpudata_64.h similarity index 100% rename from trunk/include/asm-sparc/cpudata_64.h rename to trunk/arch/sparc/include/asm/cpudata_64.h diff --git a/trunk/include/asm-sparc/cputime.h b/trunk/arch/sparc/include/asm/cputime.h similarity index 100% rename from trunk/include/asm-sparc/cputime.h rename to trunk/arch/sparc/include/asm/cputime.h diff --git a/trunk/include/asm-sparc/current.h b/trunk/arch/sparc/include/asm/current.h similarity index 96% rename from trunk/include/asm-sparc/current.h rename to trunk/arch/sparc/include/asm/current.h index 8a1d9d6643b0..10a0df55a574 100644 --- a/trunk/include/asm-sparc/current.h +++ b/trunk/arch/sparc/include/asm/current.h @@ -1,4 +1,4 @@ -/* include/asm-sparc/current.h +/* include/asm/current.h * * Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation * Copyright (C) 2002 Pete Zaitcev (zaitcev@yahoo.com) diff --git a/trunk/include/asm-sparc/cypress.h b/trunk/arch/sparc/include/asm/cypress.h similarity index 100% rename from trunk/include/asm-sparc/cypress.h rename to trunk/arch/sparc/include/asm/cypress.h diff --git a/trunk/include/asm-sparc/dcr.h b/trunk/arch/sparc/include/asm/dcr.h similarity index 100% rename from trunk/include/asm-sparc/dcr.h rename to trunk/arch/sparc/include/asm/dcr.h diff --git a/trunk/include/asm-sparc/dcu.h b/trunk/arch/sparc/include/asm/dcu.h similarity index 100% rename from trunk/include/asm-sparc/dcu.h rename to trunk/arch/sparc/include/asm/dcu.h diff --git a/trunk/include/asm-sparc/delay.h b/trunk/arch/sparc/include/asm/delay.h similarity index 65% rename from trunk/include/asm-sparc/delay.h rename to trunk/arch/sparc/include/asm/delay.h index 6210a3ce9751..467caa2a97a0 100644 --- a/trunk/include/asm-sparc/delay.h +++ b/trunk/arch/sparc/include/asm/delay.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_DELAY_H #define ___ASM_SPARC_DELAY_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/delay_32.h b/trunk/arch/sparc/include/asm/delay_32.h similarity index 100% rename from trunk/include/asm-sparc/delay_32.h rename to trunk/arch/sparc/include/asm/delay_32.h diff --git a/trunk/include/asm-sparc/delay_64.h b/trunk/arch/sparc/include/asm/delay_64.h similarity index 100% rename from trunk/include/asm-sparc/delay_64.h rename to trunk/arch/sparc/include/asm/delay_64.h diff --git a/trunk/include/asm-sparc/device.h b/trunk/arch/sparc/include/asm/device.h similarity index 100% rename from trunk/include/asm-sparc/device.h rename to trunk/arch/sparc/include/asm/device.h diff --git a/trunk/include/asm-sparc/display7seg.h b/trunk/arch/sparc/include/asm/display7seg.h similarity index 100% rename from trunk/include/asm-sparc/display7seg.h rename to trunk/arch/sparc/include/asm/display7seg.h diff --git a/trunk/include/asm-sparc/div64.h b/trunk/arch/sparc/include/asm/div64.h similarity index 100% rename from trunk/include/asm-sparc/div64.h rename to trunk/arch/sparc/include/asm/div64.h diff --git a/trunk/include/asm-sparc/dma-mapping.h b/trunk/arch/sparc/include/asm/dma-mapping.h similarity index 64% rename from trunk/include/asm-sparc/dma-mapping.h rename to trunk/arch/sparc/include/asm/dma-mapping.h index 7483504259ce..0f4150e26619 100644 --- a/trunk/include/asm-sparc/dma-mapping.h +++ b/trunk/arch/sparc/include/asm/dma-mapping.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_DMA_MAPPING_H #define ___ASM_SPARC_DMA_MAPPING_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/dma-mapping_32.h b/trunk/arch/sparc/include/asm/dma-mapping_32.h similarity index 100% rename from trunk/include/asm-sparc/dma-mapping_32.h rename to trunk/arch/sparc/include/asm/dma-mapping_32.h diff --git a/trunk/include/asm-sparc/dma-mapping_64.h b/trunk/arch/sparc/include/asm/dma-mapping_64.h similarity index 100% rename from trunk/include/asm-sparc/dma-mapping_64.h rename to trunk/arch/sparc/include/asm/dma-mapping_64.h diff --git a/trunk/include/asm-sparc/dma.h b/trunk/arch/sparc/include/asm/dma.h similarity index 66% rename from trunk/include/asm-sparc/dma.h rename to trunk/arch/sparc/include/asm/dma.h index 8cc69bfaae2a..aa1d90ac04c5 100644 --- a/trunk/include/asm-sparc/dma.h +++ b/trunk/arch/sparc/include/asm/dma.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_DMA_H #define ___ASM_SPARC_DMA_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/dma_32.h b/trunk/arch/sparc/include/asm/dma_32.h similarity index 99% rename from trunk/include/asm-sparc/dma_32.h rename to trunk/arch/sparc/include/asm/dma_32.h index 959d6c8a71ae..cf7189c0079b 100644 --- a/trunk/include/asm-sparc/dma_32.h +++ b/trunk/arch/sparc/include/asm/dma_32.h @@ -1,4 +1,4 @@ -/* include/asm-sparc/dma.h +/* include/asm/dma.h * * Copyright 1995 (C) David S. Miller (davem@davemloft.net) */ diff --git a/trunk/include/asm-sparc/dma_64.h b/trunk/arch/sparc/include/asm/dma_64.h similarity index 99% rename from trunk/include/asm-sparc/dma_64.h rename to trunk/arch/sparc/include/asm/dma_64.h index 9d4c024bd3b3..46a8aecffc02 100644 --- a/trunk/include/asm-sparc/dma_64.h +++ b/trunk/arch/sparc/include/asm/dma_64.h @@ -1,5 +1,5 @@ /* - * include/asm-sparc64/dma.h + * include/asm/dma.h * * Copyright 1996 (C) David S. Miller (davem@caip.rutgers.edu) */ diff --git a/trunk/include/asm-sparc/ebus.h b/trunk/arch/sparc/include/asm/ebus.h similarity index 66% rename from trunk/include/asm-sparc/ebus.h rename to trunk/arch/sparc/include/asm/ebus.h index a5da2d00cd18..83a6d16c22e6 100644 --- a/trunk/include/asm-sparc/ebus.h +++ b/trunk/arch/sparc/include/asm/ebus.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_EBUS_H #define ___ASM_SPARC_EBUS_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/ebus_32.h b/trunk/arch/sparc/include/asm/ebus_32.h similarity index 100% rename from trunk/include/asm-sparc/ebus_32.h rename to trunk/arch/sparc/include/asm/ebus_32.h diff --git a/trunk/include/asm-sparc/ebus_64.h b/trunk/arch/sparc/include/asm/ebus_64.h similarity index 100% rename from trunk/include/asm-sparc/ebus_64.h rename to trunk/arch/sparc/include/asm/ebus_64.h diff --git a/trunk/include/asm-sparc/ecc.h b/trunk/arch/sparc/include/asm/ecc.h similarity index 100% rename from trunk/include/asm-sparc/ecc.h rename to trunk/arch/sparc/include/asm/ecc.h diff --git a/trunk/include/asm-sparc/eeprom.h b/trunk/arch/sparc/include/asm/eeprom.h similarity index 100% rename from trunk/include/asm-sparc/eeprom.h rename to trunk/arch/sparc/include/asm/eeprom.h diff --git a/trunk/include/asm-sparc/elf.h b/trunk/arch/sparc/include/asm/elf.h similarity index 66% rename from trunk/include/asm-sparc/elf.h rename to trunk/arch/sparc/include/asm/elf.h index f035c45d7b5e..0a2816c50b07 100644 --- a/trunk/include/asm-sparc/elf.h +++ b/trunk/arch/sparc/include/asm/elf.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_ELF_H #define ___ASM_SPARC_ELF_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/elf_32.h b/trunk/arch/sparc/include/asm/elf_32.h similarity index 100% rename from trunk/include/asm-sparc/elf_32.h rename to trunk/arch/sparc/include/asm/elf_32.h diff --git a/trunk/include/asm-sparc/elf_64.h b/trunk/arch/sparc/include/asm/elf_64.h similarity index 100% rename from trunk/include/asm-sparc/elf_64.h rename to trunk/arch/sparc/include/asm/elf_64.h diff --git a/trunk/include/asm-sparc/emergency-restart.h b/trunk/arch/sparc/include/asm/emergency-restart.h similarity index 100% rename from trunk/include/asm-sparc/emergency-restart.h rename to trunk/arch/sparc/include/asm/emergency-restart.h diff --git a/trunk/include/asm-sparc/envctrl.h b/trunk/arch/sparc/include/asm/envctrl.h similarity index 100% rename from trunk/include/asm-sparc/envctrl.h rename to trunk/arch/sparc/include/asm/envctrl.h diff --git a/trunk/include/asm-sparc/errno.h b/trunk/arch/sparc/include/asm/errno.h similarity index 100% rename from trunk/include/asm-sparc/errno.h rename to trunk/arch/sparc/include/asm/errno.h diff --git a/trunk/include/asm-sparc/estate.h b/trunk/arch/sparc/include/asm/estate.h similarity index 100% rename from trunk/include/asm-sparc/estate.h rename to trunk/arch/sparc/include/asm/estate.h diff --git a/trunk/include/asm-sparc/fb.h b/trunk/arch/sparc/include/asm/fb.h similarity index 100% rename from trunk/include/asm-sparc/fb.h rename to trunk/arch/sparc/include/asm/fb.h diff --git a/trunk/include/asm-sparc/fbio.h b/trunk/arch/sparc/include/asm/fbio.h similarity index 100% rename from trunk/include/asm-sparc/fbio.h rename to trunk/arch/sparc/include/asm/fbio.h diff --git a/trunk/include/asm-sparc/fcntl.h b/trunk/arch/sparc/include/asm/fcntl.h similarity index 100% rename from trunk/include/asm-sparc/fcntl.h rename to trunk/arch/sparc/include/asm/fcntl.h diff --git a/trunk/include/asm-sparc/fhc.h b/trunk/arch/sparc/include/asm/fhc.h similarity index 100% rename from trunk/include/asm-sparc/fhc.h rename to trunk/arch/sparc/include/asm/fhc.h diff --git a/trunk/include/asm-sparc/fixmap.h b/trunk/arch/sparc/include/asm/fixmap.h similarity index 100% rename from trunk/include/asm-sparc/fixmap.h rename to trunk/arch/sparc/include/asm/fixmap.h diff --git a/trunk/include/asm-sparc/floppy.h b/trunk/arch/sparc/include/asm/floppy.h similarity index 65% rename from trunk/include/asm-sparc/floppy.h rename to trunk/arch/sparc/include/asm/floppy.h index 6c628ba15a8d..faebd335b600 100644 --- a/trunk/include/asm-sparc/floppy.h +++ b/trunk/arch/sparc/include/asm/floppy.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_FLOPPY_H #define ___ASM_SPARC_FLOPPY_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/floppy_32.h b/trunk/arch/sparc/include/asm/floppy_32.h similarity index 99% rename from trunk/include/asm-sparc/floppy_32.h rename to trunk/arch/sparc/include/asm/floppy_32.h index acdd06eafe59..ae3f00bf22ff 100644 --- a/trunk/include/asm-sparc/floppy_32.h +++ b/trunk/arch/sparc/include/asm/floppy_32.h @@ -1,4 +1,4 @@ -/* asm-sparc/floppy.h: Sparc specific parts of the Floppy driver. +/* asm/floppy.h: Sparc specific parts of the Floppy driver. * * Copyright (C) 1995 David S. Miller (davem@davemloft.net) */ diff --git a/trunk/include/asm-sparc/floppy_64.h b/trunk/arch/sparc/include/asm/floppy_64.h similarity index 100% rename from trunk/include/asm-sparc/floppy_64.h rename to trunk/arch/sparc/include/asm/floppy_64.h diff --git a/trunk/include/asm-sparc/fpumacro.h b/trunk/arch/sparc/include/asm/fpumacro.h similarity index 100% rename from trunk/include/asm-sparc/fpumacro.h rename to trunk/arch/sparc/include/asm/fpumacro.h diff --git a/trunk/include/asm-sparc64/ftrace.h b/trunk/arch/sparc/include/asm/ftrace.h similarity index 100% rename from trunk/include/asm-sparc64/ftrace.h rename to trunk/arch/sparc/include/asm/ftrace.h diff --git a/trunk/include/asm-sparc/futex.h b/trunk/arch/sparc/include/asm/futex.h similarity index 65% rename from trunk/include/asm-sparc/futex.h rename to trunk/arch/sparc/include/asm/futex.h index c6a9f038c531..736335f36713 100644 --- a/trunk/include/asm-sparc/futex.h +++ b/trunk/arch/sparc/include/asm/futex.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_FUTEX_H #define ___ASM_SPARC_FUTEX_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/futex_32.h b/trunk/arch/sparc/include/asm/futex_32.h similarity index 100% rename from trunk/include/asm-sparc/futex_32.h rename to trunk/arch/sparc/include/asm/futex_32.h diff --git a/trunk/include/asm-sparc/futex_64.h b/trunk/arch/sparc/include/asm/futex_64.h similarity index 100% rename from trunk/include/asm-sparc/futex_64.h rename to trunk/arch/sparc/include/asm/futex_64.h diff --git a/trunk/include/asm-sparc/hardirq.h b/trunk/arch/sparc/include/asm/hardirq.h similarity index 65% rename from trunk/include/asm-sparc/hardirq.h rename to trunk/arch/sparc/include/asm/hardirq.h index 156478773100..44d4e2345148 100644 --- a/trunk/include/asm-sparc/hardirq.h +++ b/trunk/arch/sparc/include/asm/hardirq.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_HARDIRQ_H #define ___ASM_SPARC_HARDIRQ_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/hardirq_32.h b/trunk/arch/sparc/include/asm/hardirq_32.h similarity index 100% rename from trunk/include/asm-sparc/hardirq_32.h rename to trunk/arch/sparc/include/asm/hardirq_32.h diff --git a/trunk/include/asm-sparc/hardirq_64.h b/trunk/arch/sparc/include/asm/hardirq_64.h similarity index 100% rename from trunk/include/asm-sparc/hardirq_64.h rename to trunk/arch/sparc/include/asm/hardirq_64.h diff --git a/trunk/include/asm-sparc/head.h b/trunk/arch/sparc/include/asm/head.h similarity index 66% rename from trunk/include/asm-sparc/head.h rename to trunk/arch/sparc/include/asm/head.h index 14652abdea31..be8f03f3e731 100644 --- a/trunk/include/asm-sparc/head.h +++ b/trunk/arch/sparc/include/asm/head.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_HEAD_H #define ___ASM_SPARC_HEAD_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/head_32.h b/trunk/arch/sparc/include/asm/head_32.h similarity index 100% rename from trunk/include/asm-sparc/head_32.h rename to trunk/arch/sparc/include/asm/head_32.h diff --git a/trunk/include/asm-sparc/head_64.h b/trunk/arch/sparc/include/asm/head_64.h similarity index 100% rename from trunk/include/asm-sparc/head_64.h rename to trunk/arch/sparc/include/asm/head_64.h diff --git a/trunk/include/asm-sparc/highmem.h b/trunk/arch/sparc/include/asm/highmem.h similarity index 100% rename from trunk/include/asm-sparc/highmem.h rename to trunk/arch/sparc/include/asm/highmem.h diff --git a/trunk/include/asm-sparc/hugetlb.h b/trunk/arch/sparc/include/asm/hugetlb.h similarity index 100% rename from trunk/include/asm-sparc/hugetlb.h rename to trunk/arch/sparc/include/asm/hugetlb.h diff --git a/trunk/include/asm-sparc/hvtramp.h b/trunk/arch/sparc/include/asm/hvtramp.h similarity index 100% rename from trunk/include/asm-sparc/hvtramp.h rename to trunk/arch/sparc/include/asm/hvtramp.h diff --git a/trunk/include/asm-sparc/hw_irq.h b/trunk/arch/sparc/include/asm/hw_irq.h similarity index 100% rename from trunk/include/asm-sparc/hw_irq.h rename to trunk/arch/sparc/include/asm/hw_irq.h diff --git a/trunk/include/asm-sparc/hypervisor.h b/trunk/arch/sparc/include/asm/hypervisor.h similarity index 100% rename from trunk/include/asm-sparc/hypervisor.h rename to trunk/arch/sparc/include/asm/hypervisor.h diff --git a/trunk/include/asm-sparc/ide.h b/trunk/arch/sparc/include/asm/ide.h similarity index 100% rename from trunk/include/asm-sparc/ide.h rename to trunk/arch/sparc/include/asm/ide.h diff --git a/trunk/include/asm-sparc/idprom.h b/trunk/arch/sparc/include/asm/idprom.h similarity index 100% rename from trunk/include/asm-sparc/idprom.h rename to trunk/arch/sparc/include/asm/idprom.h diff --git a/trunk/include/asm-sparc/intr_queue.h b/trunk/arch/sparc/include/asm/intr_queue.h similarity index 100% rename from trunk/include/asm-sparc/intr_queue.h rename to trunk/arch/sparc/include/asm/intr_queue.h diff --git a/trunk/include/asm-sparc/io-unit.h b/trunk/arch/sparc/include/asm/io-unit.h similarity index 100% rename from trunk/include/asm-sparc/io-unit.h rename to trunk/arch/sparc/include/asm/io-unit.h diff --git a/trunk/include/asm-sparc/io.h b/trunk/arch/sparc/include/asm/io.h similarity index 67% rename from trunk/include/asm-sparc/io.h rename to trunk/arch/sparc/include/asm/io.h index fc9024d3dfc3..a34b2994937a 100644 --- a/trunk/include/asm-sparc/io.h +++ b/trunk/arch/sparc/include/asm/io.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_IO_H #define ___ASM_SPARC_IO_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/io_32.h b/trunk/arch/sparc/include/asm/io_32.h similarity index 100% rename from trunk/include/asm-sparc/io_32.h rename to trunk/arch/sparc/include/asm/io_32.h diff --git a/trunk/include/asm-sparc/io_64.h b/trunk/arch/sparc/include/asm/io_64.h similarity index 100% rename from trunk/include/asm-sparc/io_64.h rename to trunk/arch/sparc/include/asm/io_64.h diff --git a/trunk/include/asm-sparc/ioctl.h b/trunk/arch/sparc/include/asm/ioctl.h similarity index 100% rename from trunk/include/asm-sparc/ioctl.h rename to trunk/arch/sparc/include/asm/ioctl.h diff --git a/trunk/include/asm-sparc/ioctls.h b/trunk/arch/sparc/include/asm/ioctls.h similarity index 100% rename from trunk/include/asm-sparc/ioctls.h rename to trunk/arch/sparc/include/asm/ioctls.h diff --git a/trunk/include/asm-sparc/iommu.h b/trunk/arch/sparc/include/asm/iommu.h similarity index 65% rename from trunk/include/asm-sparc/iommu.h rename to trunk/arch/sparc/include/asm/iommu.h index 91b072b0d7a0..e650965b4a8d 100644 --- a/trunk/include/asm-sparc/iommu.h +++ b/trunk/arch/sparc/include/asm/iommu.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_IOMMU_H #define ___ASM_SPARC_IOMMU_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/iommu_32.h b/trunk/arch/sparc/include/asm/iommu_32.h similarity index 100% rename from trunk/include/asm-sparc/iommu_32.h rename to trunk/arch/sparc/include/asm/iommu_32.h diff --git a/trunk/include/asm-sparc/iommu_64.h b/trunk/arch/sparc/include/asm/iommu_64.h similarity index 100% rename from trunk/include/asm-sparc/iommu_64.h rename to trunk/arch/sparc/include/asm/iommu_64.h diff --git a/trunk/include/asm-sparc/ipcbuf.h b/trunk/arch/sparc/include/asm/ipcbuf.h similarity index 65% rename from trunk/include/asm-sparc/ipcbuf.h rename to trunk/arch/sparc/include/asm/ipcbuf.h index 037605d986e2..17d6ef7b23a4 100644 --- a/trunk/include/asm-sparc/ipcbuf.h +++ b/trunk/arch/sparc/include/asm/ipcbuf.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_IPCBUF_H #define ___ASM_SPARC_IPCBUF_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/ipcbuf_32.h b/trunk/arch/sparc/include/asm/ipcbuf_32.h similarity index 100% rename from trunk/include/asm-sparc/ipcbuf_32.h rename to trunk/arch/sparc/include/asm/ipcbuf_32.h diff --git a/trunk/include/asm-sparc/ipcbuf_64.h b/trunk/arch/sparc/include/asm/ipcbuf_64.h similarity index 100% rename from trunk/include/asm-sparc/ipcbuf_64.h rename to trunk/arch/sparc/include/asm/ipcbuf_64.h diff --git a/trunk/include/asm-sparc/irq.h b/trunk/arch/sparc/include/asm/irq.h similarity index 66% rename from trunk/include/asm-sparc/irq.h rename to trunk/arch/sparc/include/asm/irq.h index 7af6bb4aa09c..3b44a6a14074 100644 --- a/trunk/include/asm-sparc/irq.h +++ b/trunk/arch/sparc/include/asm/irq.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_IRQ_H #define ___ASM_SPARC_IRQ_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/irq_32.h b/trunk/arch/sparc/include/asm/irq_32.h similarity index 100% rename from trunk/include/asm-sparc/irq_32.h rename to trunk/arch/sparc/include/asm/irq_32.h diff --git a/trunk/include/asm-sparc/irq_64.h b/trunk/arch/sparc/include/asm/irq_64.h similarity index 100% rename from trunk/include/asm-sparc/irq_64.h rename to trunk/arch/sparc/include/asm/irq_64.h diff --git a/trunk/include/asm-sparc/irq_regs.h b/trunk/arch/sparc/include/asm/irq_regs.h similarity index 100% rename from trunk/include/asm-sparc/irq_regs.h rename to trunk/arch/sparc/include/asm/irq_regs.h diff --git a/trunk/include/asm-sparc/irqflags.h b/trunk/arch/sparc/include/asm/irqflags.h similarity index 65% rename from trunk/include/asm-sparc/irqflags.h rename to trunk/arch/sparc/include/asm/irqflags.h index c6402b187e23..1e138632bd3f 100644 --- a/trunk/include/asm-sparc/irqflags.h +++ b/trunk/arch/sparc/include/asm/irqflags.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_IRQFLAGS_H #define ___ASM_SPARC_IRQFLAGS_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/irqflags_32.h b/trunk/arch/sparc/include/asm/irqflags_32.h similarity index 96% rename from trunk/include/asm-sparc/irqflags_32.h rename to trunk/arch/sparc/include/asm/irqflags_32.h index db398fb32826..0fca9d97d44f 100644 --- a/trunk/include/asm-sparc/irqflags_32.h +++ b/trunk/arch/sparc/include/asm/irqflags_32.h @@ -1,5 +1,5 @@ /* - * include/asm-sparc/irqflags.h + * include/asm/irqflags.h * * IRQ flags handling * diff --git a/trunk/include/asm-sparc/irqflags_64.h b/trunk/arch/sparc/include/asm/irqflags_64.h similarity index 97% rename from trunk/include/asm-sparc/irqflags_64.h rename to trunk/arch/sparc/include/asm/irqflags_64.h index 024fc54d0682..bb42e59162aa 100644 --- a/trunk/include/asm-sparc/irqflags_64.h +++ b/trunk/arch/sparc/include/asm/irqflags_64.h @@ -1,5 +1,5 @@ /* - * include/asm-sparc64/irqflags.h + * include/asm/irqflags.h * * IRQ flags handling * diff --git a/trunk/include/asm-sparc/jsflash.h b/trunk/arch/sparc/include/asm/jsflash.h similarity index 100% rename from trunk/include/asm-sparc/jsflash.h rename to trunk/arch/sparc/include/asm/jsflash.h diff --git a/trunk/include/asm-sparc/kdebug.h b/trunk/arch/sparc/include/asm/kdebug.h similarity index 65% rename from trunk/include/asm-sparc/kdebug.h rename to trunk/arch/sparc/include/asm/kdebug.h index fe07d00d0534..8d12581ca386 100644 --- a/trunk/include/asm-sparc/kdebug.h +++ b/trunk/arch/sparc/include/asm/kdebug.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_KDEBUG_H #define ___ASM_SPARC_KDEBUG_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/kdebug_32.h b/trunk/arch/sparc/include/asm/kdebug_32.h similarity index 100% rename from trunk/include/asm-sparc/kdebug_32.h rename to trunk/arch/sparc/include/asm/kdebug_32.h diff --git a/trunk/include/asm-sparc/kdebug_64.h b/trunk/arch/sparc/include/asm/kdebug_64.h similarity index 100% rename from trunk/include/asm-sparc/kdebug_64.h rename to trunk/arch/sparc/include/asm/kdebug_64.h diff --git a/trunk/include/asm-sparc/kgdb.h b/trunk/arch/sparc/include/asm/kgdb.h similarity index 100% rename from trunk/include/asm-sparc/kgdb.h rename to trunk/arch/sparc/include/asm/kgdb.h diff --git a/trunk/include/asm-sparc/kmap_types.h b/trunk/arch/sparc/include/asm/kmap_types.h similarity index 100% rename from trunk/include/asm-sparc/kmap_types.h rename to trunk/arch/sparc/include/asm/kmap_types.h diff --git a/trunk/include/asm-sparc/kprobes.h b/trunk/arch/sparc/include/asm/kprobes.h similarity index 100% rename from trunk/include/asm-sparc/kprobes.h rename to trunk/arch/sparc/include/asm/kprobes.h diff --git a/trunk/include/asm-sparc/ldc.h b/trunk/arch/sparc/include/asm/ldc.h similarity index 100% rename from trunk/include/asm-sparc/ldc.h rename to trunk/arch/sparc/include/asm/ldc.h diff --git a/trunk/include/asm-sparc/linkage.h b/trunk/arch/sparc/include/asm/linkage.h similarity index 100% rename from trunk/include/asm-sparc/linkage.h rename to trunk/arch/sparc/include/asm/linkage.h diff --git a/trunk/include/asm-sparc/lmb.h b/trunk/arch/sparc/include/asm/lmb.h similarity index 100% rename from trunk/include/asm-sparc/lmb.h rename to trunk/arch/sparc/include/asm/lmb.h diff --git a/trunk/include/asm-sparc/local.h b/trunk/arch/sparc/include/asm/local.h similarity index 100% rename from trunk/include/asm-sparc/local.h rename to trunk/arch/sparc/include/asm/local.h diff --git a/trunk/include/asm-sparc/lsu.h b/trunk/arch/sparc/include/asm/lsu.h similarity index 100% rename from trunk/include/asm-sparc/lsu.h rename to trunk/arch/sparc/include/asm/lsu.h diff --git a/trunk/include/asm-sparc/machines.h b/trunk/arch/sparc/include/asm/machines.h similarity index 100% rename from trunk/include/asm-sparc/machines.h rename to trunk/arch/sparc/include/asm/machines.h diff --git a/trunk/include/asm-sparc/mbus.h b/trunk/arch/sparc/include/asm/mbus.h similarity index 100% rename from trunk/include/asm-sparc/mbus.h rename to trunk/arch/sparc/include/asm/mbus.h diff --git a/trunk/include/asm-sparc/mc146818rtc.h b/trunk/arch/sparc/include/asm/mc146818rtc.h similarity index 64% rename from trunk/include/asm-sparc/mc146818rtc.h rename to trunk/arch/sparc/include/asm/mc146818rtc.h index 9ab65c21e9e4..67ed9e3a0235 100644 --- a/trunk/include/asm-sparc/mc146818rtc.h +++ b/trunk/arch/sparc/include/asm/mc146818rtc.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_MC146818RTC_H #define ___ASM_SPARC_MC146818RTC_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/mc146818rtc_32.h b/trunk/arch/sparc/include/asm/mc146818rtc_32.h similarity index 100% rename from trunk/include/asm-sparc/mc146818rtc_32.h rename to trunk/arch/sparc/include/asm/mc146818rtc_32.h diff --git a/trunk/include/asm-sparc/mc146818rtc_64.h b/trunk/arch/sparc/include/asm/mc146818rtc_64.h similarity index 100% rename from trunk/include/asm-sparc/mc146818rtc_64.h rename to trunk/arch/sparc/include/asm/mc146818rtc_64.h diff --git a/trunk/include/asm-sparc/mdesc.h b/trunk/arch/sparc/include/asm/mdesc.h similarity index 100% rename from trunk/include/asm-sparc/mdesc.h rename to trunk/arch/sparc/include/asm/mdesc.h diff --git a/trunk/include/asm-sparc/memreg.h b/trunk/arch/sparc/include/asm/memreg.h similarity index 100% rename from trunk/include/asm-sparc/memreg.h rename to trunk/arch/sparc/include/asm/memreg.h diff --git a/trunk/include/asm-sparc/mman.h b/trunk/arch/sparc/include/asm/mman.h similarity index 100% rename from trunk/include/asm-sparc/mman.h rename to trunk/arch/sparc/include/asm/mman.h diff --git a/trunk/include/asm-sparc/mmu.h b/trunk/arch/sparc/include/asm/mmu.h similarity index 66% rename from trunk/include/asm-sparc/mmu.h rename to trunk/arch/sparc/include/asm/mmu.h index ee66bf6dcbd6..88fa313887db 100644 --- a/trunk/include/asm-sparc/mmu.h +++ b/trunk/arch/sparc/include/asm/mmu.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_MMU_H #define ___ASM_SPARC_MMU_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/mmu_32.h b/trunk/arch/sparc/include/asm/mmu_32.h similarity index 100% rename from trunk/include/asm-sparc/mmu_32.h rename to trunk/arch/sparc/include/asm/mmu_32.h diff --git a/trunk/include/asm-sparc/mmu_64.h b/trunk/arch/sparc/include/asm/mmu_64.h similarity index 100% rename from trunk/include/asm-sparc/mmu_64.h rename to trunk/arch/sparc/include/asm/mmu_64.h diff --git a/trunk/include/asm-sparc/mmu_context.h b/trunk/arch/sparc/include/asm/mmu_context.h similarity index 64% rename from trunk/include/asm-sparc/mmu_context.h rename to trunk/arch/sparc/include/asm/mmu_context.h index e14efb9532ff..5531346c64f9 100644 --- a/trunk/include/asm-sparc/mmu_context.h +++ b/trunk/arch/sparc/include/asm/mmu_context.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_MMU_CONTEXT_H #define ___ASM_SPARC_MMU_CONTEXT_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/mmu_context_32.h b/trunk/arch/sparc/include/asm/mmu_context_32.h similarity index 100% rename from trunk/include/asm-sparc/mmu_context_32.h rename to trunk/arch/sparc/include/asm/mmu_context_32.h diff --git a/trunk/include/asm-sparc/mmu_context_64.h b/trunk/arch/sparc/include/asm/mmu_context_64.h similarity index 100% rename from trunk/include/asm-sparc/mmu_context_64.h rename to trunk/arch/sparc/include/asm/mmu_context_64.h diff --git a/trunk/include/asm-sparc/mmzone.h b/trunk/arch/sparc/include/asm/mmzone.h similarity index 100% rename from trunk/include/asm-sparc/mmzone.h rename to trunk/arch/sparc/include/asm/mmzone.h diff --git a/trunk/include/asm-sparc/module.h b/trunk/arch/sparc/include/asm/module.h similarity index 65% rename from trunk/include/asm-sparc/module.h rename to trunk/arch/sparc/include/asm/module.h index 516138fe681a..e82cf9a3e60e 100644 --- a/trunk/include/asm-sparc/module.h +++ b/trunk/arch/sparc/include/asm/module.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_MODULE_H #define ___ASM_SPARC_MODULE_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/module_32.h b/trunk/arch/sparc/include/asm/module_32.h similarity index 100% rename from trunk/include/asm-sparc/module_32.h rename to trunk/arch/sparc/include/asm/module_32.h diff --git a/trunk/include/asm-sparc/module_64.h b/trunk/arch/sparc/include/asm/module_64.h similarity index 100% rename from trunk/include/asm-sparc/module_64.h rename to trunk/arch/sparc/include/asm/module_64.h diff --git a/trunk/include/asm-sparc/mostek.h b/trunk/arch/sparc/include/asm/mostek.h similarity index 65% rename from trunk/include/asm-sparc/mostek.h rename to trunk/arch/sparc/include/asm/mostek.h index 5b9f7fec7ee7..433be3e0a69b 100644 --- a/trunk/include/asm-sparc/mostek.h +++ b/trunk/arch/sparc/include/asm/mostek.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_MOSTEK_H #define ___ASM_SPARC_MOSTEK_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/mostek_32.h b/trunk/arch/sparc/include/asm/mostek_32.h similarity index 100% rename from trunk/include/asm-sparc/mostek_32.h rename to trunk/arch/sparc/include/asm/mostek_32.h diff --git a/trunk/include/asm-sparc/mostek_64.h b/trunk/arch/sparc/include/asm/mostek_64.h similarity index 100% rename from trunk/include/asm-sparc/mostek_64.h rename to trunk/arch/sparc/include/asm/mostek_64.h diff --git a/trunk/include/asm-sparc/mpmbox.h b/trunk/arch/sparc/include/asm/mpmbox.h similarity index 100% rename from trunk/include/asm-sparc/mpmbox.h rename to trunk/arch/sparc/include/asm/mpmbox.h diff --git a/trunk/include/asm-sparc/msgbuf.h b/trunk/arch/sparc/include/asm/msgbuf.h similarity index 100% rename from trunk/include/asm-sparc/msgbuf.h rename to trunk/arch/sparc/include/asm/msgbuf.h diff --git a/trunk/include/asm-sparc/msi.h b/trunk/arch/sparc/include/asm/msi.h similarity index 100% rename from trunk/include/asm-sparc/msi.h rename to trunk/arch/sparc/include/asm/msi.h diff --git a/trunk/include/asm-sparc/mutex.h b/trunk/arch/sparc/include/asm/mutex.h similarity index 100% rename from trunk/include/asm-sparc/mutex.h rename to trunk/arch/sparc/include/asm/mutex.h diff --git a/trunk/include/asm-sparc/mxcc.h b/trunk/arch/sparc/include/asm/mxcc.h similarity index 100% rename from trunk/include/asm-sparc/mxcc.h rename to trunk/arch/sparc/include/asm/mxcc.h diff --git a/trunk/include/asm-sparc/ns87303.h b/trunk/arch/sparc/include/asm/ns87303.h similarity index 100% rename from trunk/include/asm-sparc/ns87303.h rename to trunk/arch/sparc/include/asm/ns87303.h diff --git a/trunk/include/asm-sparc/obio.h b/trunk/arch/sparc/include/asm/obio.h similarity index 100% rename from trunk/include/asm-sparc/obio.h rename to trunk/arch/sparc/include/asm/obio.h diff --git a/trunk/include/asm-sparc/of_device.h b/trunk/arch/sparc/include/asm/of_device.h similarity index 100% rename from trunk/include/asm-sparc/of_device.h rename to trunk/arch/sparc/include/asm/of_device.h diff --git a/trunk/include/asm-sparc/of_platform.h b/trunk/arch/sparc/include/asm/of_platform.h similarity index 64% rename from trunk/include/asm-sparc/of_platform.h rename to trunk/arch/sparc/include/asm/of_platform.h index 851eb84d737e..aa699775ffba 100644 --- a/trunk/include/asm-sparc/of_platform.h +++ b/trunk/arch/sparc/include/asm/of_platform.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_OF_PLATFORM_H #define ___ASM_SPARC_OF_PLATFORM_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/of_platform_32.h b/trunk/arch/sparc/include/asm/of_platform_32.h similarity index 91% rename from trunk/include/asm-sparc/of_platform_32.h rename to trunk/arch/sparc/include/asm/of_platform_32.h index 38334351c36b..723f7c9b7411 100644 --- a/trunk/include/asm-sparc/of_platform_32.h +++ b/trunk/arch/sparc/include/asm/of_platform_32.h @@ -3,7 +3,7 @@ /* * Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp. * - * Modified for Sparc by merging parts of asm-sparc/of_device.h + * Modified for Sparc by merging parts of asm/of_device.h * by Stephen Rothwell * * This program is free software; you can redistribute it and/or diff --git a/trunk/include/asm-sparc/of_platform_64.h b/trunk/arch/sparc/include/asm/of_platform_64.h similarity index 91% rename from trunk/include/asm-sparc/of_platform_64.h rename to trunk/arch/sparc/include/asm/of_platform_64.h index 78aa032b674c..4f66a5f6342d 100644 --- a/trunk/include/asm-sparc/of_platform_64.h +++ b/trunk/arch/sparc/include/asm/of_platform_64.h @@ -3,7 +3,7 @@ /* * Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp. * - * Modified for Sparc by merging parts of asm-sparc/of_device.h + * Modified for Sparc by merging parts of asm/of_device.h * by Stephen Rothwell * * This program is free software; you can redistribute it and/or diff --git a/trunk/include/asm-sparc/openprom.h b/trunk/arch/sparc/include/asm/openprom.h similarity index 65% rename from trunk/include/asm-sparc/openprom.h rename to trunk/arch/sparc/include/asm/openprom.h index 8c349f061994..aaeae905ed3f 100644 --- a/trunk/include/asm-sparc/openprom.h +++ b/trunk/arch/sparc/include/asm/openprom.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_OPENPROM_H #define ___ASM_SPARC_OPENPROM_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/openprom_32.h b/trunk/arch/sparc/include/asm/openprom_32.h similarity index 100% rename from trunk/include/asm-sparc/openprom_32.h rename to trunk/arch/sparc/include/asm/openprom_32.h diff --git a/trunk/include/asm-sparc/openprom_64.h b/trunk/arch/sparc/include/asm/openprom_64.h similarity index 100% rename from trunk/include/asm-sparc/openprom_64.h rename to trunk/arch/sparc/include/asm/openprom_64.h diff --git a/trunk/include/asm-sparc/openpromio.h b/trunk/arch/sparc/include/asm/openpromio.h similarity index 100% rename from trunk/include/asm-sparc/openpromio.h rename to trunk/arch/sparc/include/asm/openpromio.h diff --git a/trunk/include/asm-sparc/oplib.h b/trunk/arch/sparc/include/asm/oplib.h similarity index 65% rename from trunk/include/asm-sparc/oplib.h rename to trunk/arch/sparc/include/asm/oplib.h index e88d7c04a292..72e04e13a6b4 100644 --- a/trunk/include/asm-sparc/oplib.h +++ b/trunk/arch/sparc/include/asm/oplib.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_OPLIB_H #define ___ASM_SPARC_OPLIB_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/oplib_32.h b/trunk/arch/sparc/include/asm/oplib_32.h similarity index 100% rename from trunk/include/asm-sparc/oplib_32.h rename to trunk/arch/sparc/include/asm/oplib_32.h diff --git a/trunk/include/asm-sparc/oplib_64.h b/trunk/arch/sparc/include/asm/oplib_64.h similarity index 100% rename from trunk/include/asm-sparc/oplib_64.h rename to trunk/arch/sparc/include/asm/oplib_64.h diff --git a/trunk/include/asm-sparc/page.h b/trunk/arch/sparc/include/asm/page.h similarity index 66% rename from trunk/include/asm-sparc/page.h rename to trunk/arch/sparc/include/asm/page.h index f32f49fcf75c..f21de0349025 100644 --- a/trunk/include/asm-sparc/page.h +++ b/trunk/arch/sparc/include/asm/page.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_PAGE_H #define ___ASM_SPARC_PAGE_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/page_32.h b/trunk/arch/sparc/include/asm/page_32.h similarity index 100% rename from trunk/include/asm-sparc/page_32.h rename to trunk/arch/sparc/include/asm/page_32.h diff --git a/trunk/include/asm-sparc/page_64.h b/trunk/arch/sparc/include/asm/page_64.h similarity index 100% rename from trunk/include/asm-sparc/page_64.h rename to trunk/arch/sparc/include/asm/page_64.h diff --git a/trunk/include/asm-sparc/param.h b/trunk/arch/sparc/include/asm/param.h similarity index 100% rename from trunk/include/asm-sparc/param.h rename to trunk/arch/sparc/include/asm/param.h diff --git a/trunk/include/asm-sparc/parport.h b/trunk/arch/sparc/include/asm/parport.h similarity index 100% rename from trunk/include/asm-sparc/parport.h rename to trunk/arch/sparc/include/asm/parport.h diff --git a/trunk/include/asm-sparc/pbm.h b/trunk/arch/sparc/include/asm/pbm.h similarity index 100% rename from trunk/include/asm-sparc/pbm.h rename to trunk/arch/sparc/include/asm/pbm.h diff --git a/trunk/include/asm-sparc/pci.h b/trunk/arch/sparc/include/asm/pci.h similarity index 66% rename from trunk/include/asm-sparc/pci.h rename to trunk/arch/sparc/include/asm/pci.h index b807d52a4809..6e14fd179335 100644 --- a/trunk/include/asm-sparc/pci.h +++ b/trunk/arch/sparc/include/asm/pci.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_PCI_H #define ___ASM_SPARC_PCI_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/pci_32.h b/trunk/arch/sparc/include/asm/pci_32.h similarity index 100% rename from trunk/include/asm-sparc/pci_32.h rename to trunk/arch/sparc/include/asm/pci_32.h diff --git a/trunk/include/asm-sparc/pci_64.h b/trunk/arch/sparc/include/asm/pci_64.h similarity index 100% rename from trunk/include/asm-sparc/pci_64.h rename to trunk/arch/sparc/include/asm/pci_64.h diff --git a/trunk/include/asm-sparc/pcic.h b/trunk/arch/sparc/include/asm/pcic.h similarity index 100% rename from trunk/include/asm-sparc/pcic.h rename to trunk/arch/sparc/include/asm/pcic.h diff --git a/trunk/include/asm-sparc/percpu.h b/trunk/arch/sparc/include/asm/percpu.h similarity index 65% rename from trunk/include/asm-sparc/percpu.h rename to trunk/arch/sparc/include/asm/percpu.h index d98ed6cf2e36..bfb1d19ff1bf 100644 --- a/trunk/include/asm-sparc/percpu.h +++ b/trunk/arch/sparc/include/asm/percpu.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_PERCPU_H #define ___ASM_SPARC_PERCPU_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/percpu_32.h b/trunk/arch/sparc/include/asm/percpu_32.h similarity index 100% rename from trunk/include/asm-sparc/percpu_32.h rename to trunk/arch/sparc/include/asm/percpu_32.h diff --git a/trunk/include/asm-sparc/percpu_64.h b/trunk/arch/sparc/include/asm/percpu_64.h similarity index 100% rename from trunk/include/asm-sparc/percpu_64.h rename to trunk/arch/sparc/include/asm/percpu_64.h diff --git a/trunk/include/asm-sparc/perfctr.h b/trunk/arch/sparc/include/asm/perfctr.h similarity index 100% rename from trunk/include/asm-sparc/perfctr.h rename to trunk/arch/sparc/include/asm/perfctr.h diff --git a/trunk/include/asm-sparc/pgalloc.h b/trunk/arch/sparc/include/asm/pgalloc.h similarity index 65% rename from trunk/include/asm-sparc/pgalloc.h rename to trunk/arch/sparc/include/asm/pgalloc.h index 7fa02b53d392..b6db1f7cdcab 100644 --- a/trunk/include/asm-sparc/pgalloc.h +++ b/trunk/arch/sparc/include/asm/pgalloc.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_PGALLOC_H #define ___ASM_SPARC_PGALLOC_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/pgalloc_32.h b/trunk/arch/sparc/include/asm/pgalloc_32.h similarity index 100% rename from trunk/include/asm-sparc/pgalloc_32.h rename to trunk/arch/sparc/include/asm/pgalloc_32.h diff --git a/trunk/include/asm-sparc/pgalloc_64.h b/trunk/arch/sparc/include/asm/pgalloc_64.h similarity index 100% rename from trunk/include/asm-sparc/pgalloc_64.h rename to trunk/arch/sparc/include/asm/pgalloc_64.h diff --git a/trunk/include/asm-sparc/pgtable.h b/trunk/arch/sparc/include/asm/pgtable.h similarity index 65% rename from trunk/include/asm-sparc/pgtable.h rename to trunk/arch/sparc/include/asm/pgtable.h index 63cdef53bc52..59ba6f620732 100644 --- a/trunk/include/asm-sparc/pgtable.h +++ b/trunk/arch/sparc/include/asm/pgtable.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_PGTABLE_H #define ___ASM_SPARC_PGTABLE_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/pgtable_32.h b/trunk/arch/sparc/include/asm/pgtable_32.h similarity index 99% rename from trunk/include/asm-sparc/pgtable_32.h rename to trunk/arch/sparc/include/asm/pgtable_32.h index 781bd4694a1c..08237fda8874 100644 --- a/trunk/include/asm-sparc/pgtable_32.h +++ b/trunk/arch/sparc/include/asm/pgtable_32.h @@ -1,7 +1,7 @@ #ifndef _SPARC_PGTABLE_H #define _SPARC_PGTABLE_H -/* asm-sparc/pgtable.h: Defines and functions used to work +/* asm/pgtable.h: Defines and functions used to work * with Sparc page tables. * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) diff --git a/trunk/include/asm-sparc/pgtable_64.h b/trunk/arch/sparc/include/asm/pgtable_64.h similarity index 100% rename from trunk/include/asm-sparc/pgtable_64.h rename to trunk/arch/sparc/include/asm/pgtable_64.h diff --git a/trunk/include/asm-sparc/pgtsrmmu.h b/trunk/arch/sparc/include/asm/pgtsrmmu.h similarity index 100% rename from trunk/include/asm-sparc/pgtsrmmu.h rename to trunk/arch/sparc/include/asm/pgtsrmmu.h diff --git a/trunk/include/asm-sparc/pgtsun4.h b/trunk/arch/sparc/include/asm/pgtsun4.h similarity index 100% rename from trunk/include/asm-sparc/pgtsun4.h rename to trunk/arch/sparc/include/asm/pgtsun4.h diff --git a/trunk/include/asm-sparc/pgtsun4c.h b/trunk/arch/sparc/include/asm/pgtsun4c.h similarity index 100% rename from trunk/include/asm-sparc/pgtsun4c.h rename to trunk/arch/sparc/include/asm/pgtsun4c.h diff --git a/trunk/include/asm-sparc/pil.h b/trunk/arch/sparc/include/asm/pil.h similarity index 100% rename from trunk/include/asm-sparc/pil.h rename to trunk/arch/sparc/include/asm/pil.h diff --git a/trunk/include/asm-sparc/poll.h b/trunk/arch/sparc/include/asm/poll.h similarity index 100% rename from trunk/include/asm-sparc/poll.h rename to trunk/arch/sparc/include/asm/poll.h diff --git a/trunk/include/asm-sparc/posix_types.h b/trunk/arch/sparc/include/asm/posix_types.h similarity index 64% rename from trunk/include/asm-sparc/posix_types.h rename to trunk/arch/sparc/include/asm/posix_types.h index 58c820d75e83..03a0e091a884 100644 --- a/trunk/include/asm-sparc/posix_types.h +++ b/trunk/arch/sparc/include/asm/posix_types.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_POSIX_TYPES_H #define ___ASM_SPARC_POSIX_TYPES_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/posix_types_32.h b/trunk/arch/sparc/include/asm/posix_types_32.h similarity index 100% rename from trunk/include/asm-sparc/posix_types_32.h rename to trunk/arch/sparc/include/asm/posix_types_32.h diff --git a/trunk/include/asm-sparc/posix_types_64.h b/trunk/arch/sparc/include/asm/posix_types_64.h similarity index 100% rename from trunk/include/asm-sparc/posix_types_64.h rename to trunk/arch/sparc/include/asm/posix_types_64.h diff --git a/trunk/include/asm-sparc/processor.h b/trunk/arch/sparc/include/asm/processor.h similarity index 64% rename from trunk/include/asm-sparc/processor.h rename to trunk/arch/sparc/include/asm/processor.h index 11a66bb02eaa..9da9646bf6c6 100644 --- a/trunk/include/asm-sparc/processor.h +++ b/trunk/arch/sparc/include/asm/processor.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_PROCESSOR_H #define ___ASM_SPARC_PROCESSOR_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/processor_32.h b/trunk/arch/sparc/include/asm/processor_32.h similarity index 99% rename from trunk/include/asm-sparc/processor_32.h rename to trunk/arch/sparc/include/asm/processor_32.h index 562c0d69c537..718e7e014181 100644 --- a/trunk/include/asm-sparc/processor_32.h +++ b/trunk/arch/sparc/include/asm/processor_32.h @@ -1,4 +1,4 @@ -/* include/asm-sparc/processor.h +/* include/asm/processor.h * * Copyright (C) 1994 David S. Miller (davem@caip.rutgers.edu) */ diff --git a/trunk/include/asm-sparc/processor_64.h b/trunk/arch/sparc/include/asm/processor_64.h similarity index 99% rename from trunk/include/asm-sparc/processor_64.h rename to trunk/arch/sparc/include/asm/processor_64.h index 70d42801a0d2..137a6bd72fc8 100644 --- a/trunk/include/asm-sparc/processor_64.h +++ b/trunk/arch/sparc/include/asm/processor_64.h @@ -1,5 +1,5 @@ /* - * include/asm-sparc64/processor.h + * include/asm/processor.h * * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) */ diff --git a/trunk/include/asm-sparc/prom.h b/trunk/arch/sparc/include/asm/prom.h similarity index 100% rename from trunk/include/asm-sparc/prom.h rename to trunk/arch/sparc/include/asm/prom.h diff --git a/trunk/include/asm-sparc/psr.h b/trunk/arch/sparc/include/asm/psr.h similarity index 100% rename from trunk/include/asm-sparc/psr.h rename to trunk/arch/sparc/include/asm/psr.h diff --git a/trunk/include/asm-sparc/psrcompat.h b/trunk/arch/sparc/include/asm/psrcompat.h similarity index 100% rename from trunk/include/asm-sparc/psrcompat.h rename to trunk/arch/sparc/include/asm/psrcompat.h diff --git a/trunk/include/asm-sparc/pstate.h b/trunk/arch/sparc/include/asm/pstate.h similarity index 100% rename from trunk/include/asm-sparc/pstate.h rename to trunk/arch/sparc/include/asm/pstate.h diff --git a/trunk/include/asm-sparc/ptrace.h b/trunk/arch/sparc/include/asm/ptrace.h similarity index 65% rename from trunk/include/asm-sparc/ptrace.h rename to trunk/arch/sparc/include/asm/ptrace.h index f36ab6c30ff3..6dcbe2eed2e2 100644 --- a/trunk/include/asm-sparc/ptrace.h +++ b/trunk/arch/sparc/include/asm/ptrace.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_PTRACE_H #define ___ASM_SPARC_PTRACE_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/ptrace_32.h b/trunk/arch/sparc/include/asm/ptrace_32.h similarity index 100% rename from trunk/include/asm-sparc/ptrace_32.h rename to trunk/arch/sparc/include/asm/ptrace_32.h diff --git a/trunk/include/asm-sparc/ptrace_64.h b/trunk/arch/sparc/include/asm/ptrace_64.h similarity index 100% rename from trunk/include/asm-sparc/ptrace_64.h rename to trunk/arch/sparc/include/asm/ptrace_64.h diff --git a/trunk/include/asm-sparc/reboot.h b/trunk/arch/sparc/include/asm/reboot.h similarity index 100% rename from trunk/include/asm-sparc/reboot.h rename to trunk/arch/sparc/include/asm/reboot.h diff --git a/trunk/include/asm-sparc/reg.h b/trunk/arch/sparc/include/asm/reg.h similarity index 66% rename from trunk/include/asm-sparc/reg.h rename to trunk/arch/sparc/include/asm/reg.h index cb34b0a49aad..0c16e19cae4d 100644 --- a/trunk/include/asm-sparc/reg.h +++ b/trunk/arch/sparc/include/asm/reg.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_REG_H #define ___ASM_SPARC_REG_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/reg_32.h b/trunk/arch/sparc/include/asm/reg_32.h similarity index 98% rename from trunk/include/asm-sparc/reg_32.h rename to trunk/arch/sparc/include/asm/reg_32.h index 42fecfcd97e7..1efb056fb3d1 100644 --- a/trunk/include/asm-sparc/reg_32.h +++ b/trunk/arch/sparc/include/asm/reg_32.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-sparc/reg.h + * linux/include/asm/reg.h * Layout of the registers as expected by gdb on the Sparc * we should replace the user.h definitions with those in * this file, we don't even use the other diff --git a/trunk/include/asm-sparc/reg_64.h b/trunk/arch/sparc/include/asm/reg_64.h similarity index 97% rename from trunk/include/asm-sparc/reg_64.h rename to trunk/arch/sparc/include/asm/reg_64.h index eb24a07ff4d5..6f277d7c7d88 100644 --- a/trunk/include/asm-sparc/reg_64.h +++ b/trunk/arch/sparc/include/asm/reg_64.h @@ -1,5 +1,5 @@ /* - * linux/asm-sparc64/reg.h + * linux/asm/reg.h * Layout of the registers as expected by gdb on the Sparc * we should replace the user.h definitions with those in * this file, we don't even use the other diff --git a/trunk/include/asm-sparc/resource.h b/trunk/arch/sparc/include/asm/resource.h similarity index 100% rename from trunk/include/asm-sparc/resource.h rename to trunk/arch/sparc/include/asm/resource.h diff --git a/trunk/include/asm-sparc/ross.h b/trunk/arch/sparc/include/asm/ross.h similarity index 100% rename from trunk/include/asm-sparc/ross.h rename to trunk/arch/sparc/include/asm/ross.h diff --git a/trunk/include/asm-sparc/rtc.h b/trunk/arch/sparc/include/asm/rtc.h similarity index 100% rename from trunk/include/asm-sparc/rtc.h rename to trunk/arch/sparc/include/asm/rtc.h diff --git a/trunk/include/asm-sparc/rwsem-const.h b/trunk/arch/sparc/include/asm/rwsem-const.h similarity index 100% rename from trunk/include/asm-sparc/rwsem-const.h rename to trunk/arch/sparc/include/asm/rwsem-const.h diff --git a/trunk/include/asm-sparc/rwsem.h b/trunk/arch/sparc/include/asm/rwsem.h similarity index 100% rename from trunk/include/asm-sparc/rwsem.h rename to trunk/arch/sparc/include/asm/rwsem.h diff --git a/trunk/include/asm-sparc/sbi.h b/trunk/arch/sparc/include/asm/sbi.h similarity index 100% rename from trunk/include/asm-sparc/sbi.h rename to trunk/arch/sparc/include/asm/sbi.h diff --git a/trunk/include/asm-sparc/sbus.h b/trunk/arch/sparc/include/asm/sbus.h similarity index 66% rename from trunk/include/asm-sparc/sbus.h rename to trunk/arch/sparc/include/asm/sbus.h index 8f29a1979665..f82481ab44db 100644 --- a/trunk/include/asm-sparc/sbus.h +++ b/trunk/arch/sparc/include/asm/sbus.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_SBUS_H #define ___ASM_SPARC_SBUS_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/sbus_32.h b/trunk/arch/sparc/include/asm/sbus_32.h similarity index 100% rename from trunk/include/asm-sparc/sbus_32.h rename to trunk/arch/sparc/include/asm/sbus_32.h diff --git a/trunk/include/asm-sparc/sbus_64.h b/trunk/arch/sparc/include/asm/sbus_64.h similarity index 100% rename from trunk/include/asm-sparc/sbus_64.h rename to trunk/arch/sparc/include/asm/sbus_64.h diff --git a/trunk/include/asm-sparc/scatterlist.h b/trunk/arch/sparc/include/asm/scatterlist.h similarity index 64% rename from trunk/include/asm-sparc/scatterlist.h rename to trunk/arch/sparc/include/asm/scatterlist.h index b1a0e316c2b6..ec21a4517641 100644 --- a/trunk/include/asm-sparc/scatterlist.h +++ b/trunk/arch/sparc/include/asm/scatterlist.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_SCATTERLIST_H #define ___ASM_SPARC_SCATTERLIST_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/scatterlist_32.h b/trunk/arch/sparc/include/asm/scatterlist_32.h similarity index 100% rename from trunk/include/asm-sparc/scatterlist_32.h rename to trunk/arch/sparc/include/asm/scatterlist_32.h diff --git a/trunk/include/asm-sparc/scatterlist_64.h b/trunk/arch/sparc/include/asm/scatterlist_64.h similarity index 100% rename from trunk/include/asm-sparc/scatterlist_64.h rename to trunk/arch/sparc/include/asm/scatterlist_64.h diff --git a/trunk/include/asm-sparc/scratchpad.h b/trunk/arch/sparc/include/asm/scratchpad.h similarity index 100% rename from trunk/include/asm-sparc/scratchpad.h rename to trunk/arch/sparc/include/asm/scratchpad.h diff --git a/trunk/include/asm-sparc/seccomp.h b/trunk/arch/sparc/include/asm/seccomp.h similarity index 100% rename from trunk/include/asm-sparc/seccomp.h rename to trunk/arch/sparc/include/asm/seccomp.h diff --git a/trunk/include/asm-sparc/sections.h b/trunk/arch/sparc/include/asm/sections.h similarity index 65% rename from trunk/include/asm-sparc/sections.h rename to trunk/arch/sparc/include/asm/sections.h index cbd019162425..c7c69b00967f 100644 --- a/trunk/include/asm-sparc/sections.h +++ b/trunk/arch/sparc/include/asm/sections.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_SECTIONS_H #define ___ASM_SPARC_SECTIONS_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/sections_32.h b/trunk/arch/sparc/include/asm/sections_32.h similarity index 100% rename from trunk/include/asm-sparc/sections_32.h rename to trunk/arch/sparc/include/asm/sections_32.h diff --git a/trunk/include/asm-sparc/sections_64.h b/trunk/arch/sparc/include/asm/sections_64.h similarity index 100% rename from trunk/include/asm-sparc/sections_64.h rename to trunk/arch/sparc/include/asm/sections_64.h diff --git a/trunk/include/asm-sparc/sembuf.h b/trunk/arch/sparc/include/asm/sembuf.h similarity index 100% rename from trunk/include/asm-sparc/sembuf.h rename to trunk/arch/sparc/include/asm/sembuf.h diff --git a/trunk/include/asm-sparc/setup.h b/trunk/arch/sparc/include/asm/setup.h similarity index 100% rename from trunk/include/asm-sparc/setup.h rename to trunk/arch/sparc/include/asm/setup.h diff --git a/trunk/include/asm-sparc/sfafsr.h b/trunk/arch/sparc/include/asm/sfafsr.h similarity index 100% rename from trunk/include/asm-sparc/sfafsr.h rename to trunk/arch/sparc/include/asm/sfafsr.h diff --git a/trunk/include/asm-sparc/sfp-machine.h b/trunk/arch/sparc/include/asm/sfp-machine.h similarity index 64% rename from trunk/include/asm-sparc/sfp-machine.h rename to trunk/arch/sparc/include/asm/sfp-machine.h index c676fcc2dd27..4ebc3823ed4f 100644 --- a/trunk/include/asm-sparc/sfp-machine.h +++ b/trunk/arch/sparc/include/asm/sfp-machine.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_SFP_MACHINE_H #define ___ASM_SPARC_SFP_MACHINE_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/sfp-machine_32.h b/trunk/arch/sparc/include/asm/sfp-machine_32.h similarity index 100% rename from trunk/include/asm-sparc/sfp-machine_32.h rename to trunk/arch/sparc/include/asm/sfp-machine_32.h diff --git a/trunk/include/asm-sparc/sfp-machine_64.h b/trunk/arch/sparc/include/asm/sfp-machine_64.h similarity index 100% rename from trunk/include/asm-sparc/sfp-machine_64.h rename to trunk/arch/sparc/include/asm/sfp-machine_64.h diff --git a/trunk/include/asm-sparc/shmbuf.h b/trunk/arch/sparc/include/asm/shmbuf.h similarity index 100% rename from trunk/include/asm-sparc/shmbuf.h rename to trunk/arch/sparc/include/asm/shmbuf.h diff --git a/trunk/include/asm-sparc/shmparam.h b/trunk/arch/sparc/include/asm/shmparam.h similarity index 65% rename from trunk/include/asm-sparc/shmparam.h rename to trunk/arch/sparc/include/asm/shmparam.h index 16fda7e9acc8..8bf0cfe0694f 100644 --- a/trunk/include/asm-sparc/shmparam.h +++ b/trunk/arch/sparc/include/asm/shmparam.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_SHMPARAM_H #define ___ASM_SPARC_SHMPARAM_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/shmparam_32.h b/trunk/arch/sparc/include/asm/shmparam_32.h similarity index 100% rename from trunk/include/asm-sparc/shmparam_32.h rename to trunk/arch/sparc/include/asm/shmparam_32.h diff --git a/trunk/include/asm-sparc/shmparam_64.h b/trunk/arch/sparc/include/asm/shmparam_64.h similarity index 100% rename from trunk/include/asm-sparc/shmparam_64.h rename to trunk/arch/sparc/include/asm/shmparam_64.h diff --git a/trunk/include/asm-sparc/sigcontext.h b/trunk/arch/sparc/include/asm/sigcontext.h similarity index 64% rename from trunk/include/asm-sparc/sigcontext.h rename to trunk/arch/sparc/include/asm/sigcontext.h index 82fc7d54a4fa..e92de7e286b5 100644 --- a/trunk/include/asm-sparc/sigcontext.h +++ b/trunk/arch/sparc/include/asm/sigcontext.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_SIGCONTEXT_H #define ___ASM_SPARC_SIGCONTEXT_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/sigcontext_32.h b/trunk/arch/sparc/include/asm/sigcontext_32.h similarity index 100% rename from trunk/include/asm-sparc/sigcontext_32.h rename to trunk/arch/sparc/include/asm/sigcontext_32.h diff --git a/trunk/include/asm-sparc/sigcontext_64.h b/trunk/arch/sparc/include/asm/sigcontext_64.h similarity index 100% rename from trunk/include/asm-sparc/sigcontext_64.h rename to trunk/arch/sparc/include/asm/sigcontext_64.h diff --git a/trunk/include/asm-sparc/siginfo.h b/trunk/arch/sparc/include/asm/siginfo.h similarity index 65% rename from trunk/include/asm-sparc/siginfo.h rename to trunk/arch/sparc/include/asm/siginfo.h index 2c9fccf4ce18..bd81f8d7f5ce 100644 --- a/trunk/include/asm-sparc/siginfo.h +++ b/trunk/arch/sparc/include/asm/siginfo.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_SIGINFO_H #define ___ASM_SPARC_SIGINFO_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/siginfo_32.h b/trunk/arch/sparc/include/asm/siginfo_32.h similarity index 100% rename from trunk/include/asm-sparc/siginfo_32.h rename to trunk/arch/sparc/include/asm/siginfo_32.h diff --git a/trunk/include/asm-sparc/siginfo_64.h b/trunk/arch/sparc/include/asm/siginfo_64.h similarity index 100% rename from trunk/include/asm-sparc/siginfo_64.h rename to trunk/arch/sparc/include/asm/siginfo_64.h diff --git a/trunk/include/asm-sparc/signal.h b/trunk/arch/sparc/include/asm/signal.h similarity index 65% rename from trunk/include/asm-sparc/signal.h rename to trunk/arch/sparc/include/asm/signal.h index 36f5f9e482f7..27ab05dc203e 100644 --- a/trunk/include/asm-sparc/signal.h +++ b/trunk/arch/sparc/include/asm/signal.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_SIGNAL_H #define ___ASM_SPARC_SIGNAL_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/signal_32.h b/trunk/arch/sparc/include/asm/signal_32.h similarity index 100% rename from trunk/include/asm-sparc/signal_32.h rename to trunk/arch/sparc/include/asm/signal_32.h diff --git a/trunk/include/asm-sparc/signal_64.h b/trunk/arch/sparc/include/asm/signal_64.h similarity index 100% rename from trunk/include/asm-sparc/signal_64.h rename to trunk/arch/sparc/include/asm/signal_64.h diff --git a/trunk/include/asm-sparc/smp.h b/trunk/arch/sparc/include/asm/smp.h similarity index 66% rename from trunk/include/asm-sparc/smp.h rename to trunk/arch/sparc/include/asm/smp.h index 1f9dedfbabd8..b59672d0e19b 100644 --- a/trunk/include/asm-sparc/smp.h +++ b/trunk/arch/sparc/include/asm/smp.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_SMP_H #define ___ASM_SPARC_SMP_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/smp_32.h b/trunk/arch/sparc/include/asm/smp_32.h similarity index 100% rename from trunk/include/asm-sparc/smp_32.h rename to trunk/arch/sparc/include/asm/smp_32.h diff --git a/trunk/include/asm-sparc/smp_64.h b/trunk/arch/sparc/include/asm/smp_64.h similarity index 100% rename from trunk/include/asm-sparc/smp_64.h rename to trunk/arch/sparc/include/asm/smp_64.h diff --git a/trunk/include/asm-sparc/smpprim.h b/trunk/arch/sparc/include/asm/smpprim.h similarity index 100% rename from trunk/include/asm-sparc/smpprim.h rename to trunk/arch/sparc/include/asm/smpprim.h diff --git a/trunk/include/asm-sparc/socket.h b/trunk/arch/sparc/include/asm/socket.h similarity index 100% rename from trunk/include/asm-sparc/socket.h rename to trunk/arch/sparc/include/asm/socket.h diff --git a/trunk/include/asm-sparc/sockios.h b/trunk/arch/sparc/include/asm/sockios.h similarity index 100% rename from trunk/include/asm-sparc/sockios.h rename to trunk/arch/sparc/include/asm/sockios.h diff --git a/trunk/include/asm-sparc/sparsemem.h b/trunk/arch/sparc/include/asm/sparsemem.h similarity index 100% rename from trunk/include/asm-sparc/sparsemem.h rename to trunk/arch/sparc/include/asm/sparsemem.h diff --git a/trunk/include/asm-sparc/spinlock.h b/trunk/arch/sparc/include/asm/spinlock.h similarity index 65% rename from trunk/include/asm-sparc/spinlock.h rename to trunk/arch/sparc/include/asm/spinlock.h index 3b71c50b72eb..f276b0036b2c 100644 --- a/trunk/include/asm-sparc/spinlock.h +++ b/trunk/arch/sparc/include/asm/spinlock.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_SPINLOCK_H #define ___ASM_SPARC_SPINLOCK_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/spinlock_32.h b/trunk/arch/sparc/include/asm/spinlock_32.h similarity index 100% rename from trunk/include/asm-sparc/spinlock_32.h rename to trunk/arch/sparc/include/asm/spinlock_32.h diff --git a/trunk/include/asm-sparc/spinlock_64.h b/trunk/arch/sparc/include/asm/spinlock_64.h similarity index 100% rename from trunk/include/asm-sparc/spinlock_64.h rename to trunk/arch/sparc/include/asm/spinlock_64.h diff --git a/trunk/include/asm-sparc/spinlock_types.h b/trunk/arch/sparc/include/asm/spinlock_types.h similarity index 100% rename from trunk/include/asm-sparc/spinlock_types.h rename to trunk/arch/sparc/include/asm/spinlock_types.h diff --git a/trunk/include/asm-sparc/spitfire.h b/trunk/arch/sparc/include/asm/spitfire.h similarity index 100% rename from trunk/include/asm-sparc/spitfire.h rename to trunk/arch/sparc/include/asm/spitfire.h diff --git a/trunk/include/asm-sparc/sstate.h b/trunk/arch/sparc/include/asm/sstate.h similarity index 100% rename from trunk/include/asm-sparc/sstate.h rename to trunk/arch/sparc/include/asm/sstate.h diff --git a/trunk/include/asm-sparc/stacktrace.h b/trunk/arch/sparc/include/asm/stacktrace.h similarity index 100% rename from trunk/include/asm-sparc/stacktrace.h rename to trunk/arch/sparc/include/asm/stacktrace.h diff --git a/trunk/include/asm-sparc/starfire.h b/trunk/arch/sparc/include/asm/starfire.h similarity index 100% rename from trunk/include/asm-sparc/starfire.h rename to trunk/arch/sparc/include/asm/starfire.h diff --git a/trunk/include/asm-sparc/stat.h b/trunk/arch/sparc/include/asm/stat.h similarity index 66% rename from trunk/include/asm-sparc/stat.h rename to trunk/arch/sparc/include/asm/stat.h index 9fdcaf8c9cd3..d8153013df72 100644 --- a/trunk/include/asm-sparc/stat.h +++ b/trunk/arch/sparc/include/asm/stat.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_STAT_H #define ___ASM_SPARC_STAT_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/stat_32.h b/trunk/arch/sparc/include/asm/stat_32.h similarity index 100% rename from trunk/include/asm-sparc/stat_32.h rename to trunk/arch/sparc/include/asm/stat_32.h diff --git a/trunk/include/asm-sparc/stat_64.h b/trunk/arch/sparc/include/asm/stat_64.h similarity index 100% rename from trunk/include/asm-sparc/stat_64.h rename to trunk/arch/sparc/include/asm/stat_64.h diff --git a/trunk/include/asm-sparc/statfs.h b/trunk/arch/sparc/include/asm/statfs.h similarity index 65% rename from trunk/include/asm-sparc/statfs.h rename to trunk/arch/sparc/include/asm/statfs.h index a70cc52e7018..5e937a73743d 100644 --- a/trunk/include/asm-sparc/statfs.h +++ b/trunk/arch/sparc/include/asm/statfs.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_STATFS_H #define ___ASM_SPARC_STATFS_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/statfs_32.h b/trunk/arch/sparc/include/asm/statfs_32.h similarity index 100% rename from trunk/include/asm-sparc/statfs_32.h rename to trunk/arch/sparc/include/asm/statfs_32.h diff --git a/trunk/include/asm-sparc/statfs_64.h b/trunk/arch/sparc/include/asm/statfs_64.h similarity index 100% rename from trunk/include/asm-sparc/statfs_64.h rename to trunk/arch/sparc/include/asm/statfs_64.h diff --git a/trunk/include/asm-sparc/string.h b/trunk/arch/sparc/include/asm/string.h similarity index 65% rename from trunk/include/asm-sparc/string.h rename to trunk/arch/sparc/include/asm/string.h index 14c04c7697a5..98b72a0c8e6e 100644 --- a/trunk/include/asm-sparc/string.h +++ b/trunk/arch/sparc/include/asm/string.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_STRING_H #define ___ASM_SPARC_STRING_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/string_32.h b/trunk/arch/sparc/include/asm/string_32.h similarity index 100% rename from trunk/include/asm-sparc/string_32.h rename to trunk/arch/sparc/include/asm/string_32.h diff --git a/trunk/include/asm-sparc/string_64.h b/trunk/arch/sparc/include/asm/string_64.h similarity index 100% rename from trunk/include/asm-sparc/string_64.h rename to trunk/arch/sparc/include/asm/string_64.h diff --git a/trunk/include/asm-sparc/sun4paddr.h b/trunk/arch/sparc/include/asm/sun4paddr.h similarity index 100% rename from trunk/include/asm-sparc/sun4paddr.h rename to trunk/arch/sparc/include/asm/sun4paddr.h diff --git a/trunk/include/asm-sparc/sun4prom.h b/trunk/arch/sparc/include/asm/sun4prom.h similarity index 100% rename from trunk/include/asm-sparc/sun4prom.h rename to trunk/arch/sparc/include/asm/sun4prom.h diff --git a/trunk/include/asm-sparc/sunbpp.h b/trunk/arch/sparc/include/asm/sunbpp.h similarity index 99% rename from trunk/include/asm-sparc/sunbpp.h rename to trunk/arch/sparc/include/asm/sunbpp.h index 92ee1a8ff3a2..d81a02eaf78b 100644 --- a/trunk/include/asm-sparc/sunbpp.h +++ b/trunk/arch/sparc/include/asm/sunbpp.h @@ -1,5 +1,5 @@ /* - * include/asm-sparc/sunbpp.h + * include/asm/sunbpp.h */ #ifndef _ASM_SPARC_SUNBPP_H diff --git a/trunk/include/asm-sparc/swift.h b/trunk/arch/sparc/include/asm/swift.h similarity index 100% rename from trunk/include/asm-sparc/swift.h rename to trunk/arch/sparc/include/asm/swift.h diff --git a/trunk/include/asm-sparc/syscalls.h b/trunk/arch/sparc/include/asm/syscalls.h similarity index 100% rename from trunk/include/asm-sparc/syscalls.h rename to trunk/arch/sparc/include/asm/syscalls.h diff --git a/trunk/include/asm-sparc/sysen.h b/trunk/arch/sparc/include/asm/sysen.h similarity index 100% rename from trunk/include/asm-sparc/sysen.h rename to trunk/arch/sparc/include/asm/sysen.h diff --git a/trunk/include/asm-sparc/system.h b/trunk/arch/sparc/include/asm/system.h similarity index 65% rename from trunk/include/asm-sparc/system.h rename to trunk/arch/sparc/include/asm/system.h index 15e2a3bc4f61..7944a7cfc996 100644 --- a/trunk/include/asm-sparc/system.h +++ b/trunk/arch/sparc/include/asm/system.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_SYSTEM_H #define ___ASM_SPARC_SYSTEM_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/system_32.h b/trunk/arch/sparc/include/asm/system_32.h similarity index 100% rename from trunk/include/asm-sparc/system_32.h rename to trunk/arch/sparc/include/asm/system_32.h diff --git a/trunk/include/asm-sparc/system_64.h b/trunk/arch/sparc/include/asm/system_64.h similarity index 100% rename from trunk/include/asm-sparc/system_64.h rename to trunk/arch/sparc/include/asm/system_64.h diff --git a/trunk/include/asm-sparc/termbits.h b/trunk/arch/sparc/include/asm/termbits.h similarity index 100% rename from trunk/include/asm-sparc/termbits.h rename to trunk/arch/sparc/include/asm/termbits.h diff --git a/trunk/include/asm-sparc/termios.h b/trunk/arch/sparc/include/asm/termios.h similarity index 100% rename from trunk/include/asm-sparc/termios.h rename to trunk/arch/sparc/include/asm/termios.h diff --git a/trunk/include/asm-sparc/thread_info.h b/trunk/arch/sparc/include/asm/thread_info.h similarity index 64% rename from trunk/include/asm-sparc/thread_info.h rename to trunk/arch/sparc/include/asm/thread_info.h index 64155cf89f37..122d7acc07e6 100644 --- a/trunk/include/asm-sparc/thread_info.h +++ b/trunk/arch/sparc/include/asm/thread_info.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_THREAD_INFO_H #define ___ASM_SPARC_THREAD_INFO_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/thread_info_32.h b/trunk/arch/sparc/include/asm/thread_info_32.h similarity index 100% rename from trunk/include/asm-sparc/thread_info_32.h rename to trunk/arch/sparc/include/asm/thread_info_32.h diff --git a/trunk/include/asm-sparc/thread_info_64.h b/trunk/arch/sparc/include/asm/thread_info_64.h similarity index 100% rename from trunk/include/asm-sparc/thread_info_64.h rename to trunk/arch/sparc/include/asm/thread_info_64.h diff --git a/trunk/include/asm-sparc/timer.h b/trunk/arch/sparc/include/asm/timer.h similarity index 65% rename from trunk/include/asm-sparc/timer.h rename to trunk/arch/sparc/include/asm/timer.h index 475baa05a96e..612fd2779d9e 100644 --- a/trunk/include/asm-sparc/timer.h +++ b/trunk/arch/sparc/include/asm/timer.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_TIMER_H #define ___ASM_SPARC_TIMER_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/timer_32.h b/trunk/arch/sparc/include/asm/timer_32.h similarity index 100% rename from trunk/include/asm-sparc/timer_32.h rename to trunk/arch/sparc/include/asm/timer_32.h diff --git a/trunk/include/asm-sparc/timer_64.h b/trunk/arch/sparc/include/asm/timer_64.h similarity index 100% rename from trunk/include/asm-sparc/timer_64.h rename to trunk/arch/sparc/include/asm/timer_64.h diff --git a/trunk/include/asm-sparc/timex.h b/trunk/arch/sparc/include/asm/timex.h similarity index 65% rename from trunk/include/asm-sparc/timex.h rename to trunk/arch/sparc/include/asm/timex.h index 01d9f199d452..70cc37b73827 100644 --- a/trunk/include/asm-sparc/timex.h +++ b/trunk/arch/sparc/include/asm/timex.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_TIMEX_H #define ___ASM_SPARC_TIMEX_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/timex_32.h b/trunk/arch/sparc/include/asm/timex_32.h similarity index 89% rename from trunk/include/asm-sparc/timex_32.h rename to trunk/arch/sparc/include/asm/timex_32.h index 71b45c90ccae..b6ccdb0d6f7d 100644 --- a/trunk/include/asm-sparc/timex_32.h +++ b/trunk/arch/sparc/include/asm/timex_32.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-sparc/timex.h + * linux/include/asm/timex.h * * sparc architecture timex specifications */ diff --git a/trunk/include/asm-sparc/timex_64.h b/trunk/arch/sparc/include/asm/timex_64.h similarity index 90% rename from trunk/include/asm-sparc/timex_64.h rename to trunk/arch/sparc/include/asm/timex_64.h index c622535c4560..18b30bc9823b 100644 --- a/trunk/include/asm-sparc/timex_64.h +++ b/trunk/arch/sparc/include/asm/timex_64.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-sparc64/timex.h + * linux/include/asm/timex.h * * sparc64 architecture timex specifications */ diff --git a/trunk/include/asm-sparc/tlb.h b/trunk/arch/sparc/include/asm/tlb.h similarity index 66% rename from trunk/include/asm-sparc/tlb.h rename to trunk/arch/sparc/include/asm/tlb.h index a821057327c4..92d0393bbcdc 100644 --- a/trunk/include/asm-sparc/tlb.h +++ b/trunk/arch/sparc/include/asm/tlb.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_TLB_H #define ___ASM_SPARC_TLB_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/tlb_32.h b/trunk/arch/sparc/include/asm/tlb_32.h similarity index 100% rename from trunk/include/asm-sparc/tlb_32.h rename to trunk/arch/sparc/include/asm/tlb_32.h diff --git a/trunk/include/asm-sparc/tlb_64.h b/trunk/arch/sparc/include/asm/tlb_64.h similarity index 100% rename from trunk/include/asm-sparc/tlb_64.h rename to trunk/arch/sparc/include/asm/tlb_64.h diff --git a/trunk/include/asm-sparc/tlbflush.h b/trunk/arch/sparc/include/asm/tlbflush.h similarity index 65% rename from trunk/include/asm-sparc/tlbflush.h rename to trunk/arch/sparc/include/asm/tlbflush.h index 6e6bc12227b8..2c9629fad1e2 100644 --- a/trunk/include/asm-sparc/tlbflush.h +++ b/trunk/arch/sparc/include/asm/tlbflush.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_TLBFLUSH_H #define ___ASM_SPARC_TLBFLUSH_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/tlbflush_32.h b/trunk/arch/sparc/include/asm/tlbflush_32.h similarity index 100% rename from trunk/include/asm-sparc/tlbflush_32.h rename to trunk/arch/sparc/include/asm/tlbflush_32.h diff --git a/trunk/include/asm-sparc/tlbflush_64.h b/trunk/arch/sparc/include/asm/tlbflush_64.h similarity index 100% rename from trunk/include/asm-sparc/tlbflush_64.h rename to trunk/arch/sparc/include/asm/tlbflush_64.h diff --git a/trunk/include/asm-sparc/topology.h b/trunk/arch/sparc/include/asm/topology.h similarity index 65% rename from trunk/include/asm-sparc/topology.h rename to trunk/arch/sparc/include/asm/topology.h index ed13630f32e2..ee4f191d394a 100644 --- a/trunk/include/asm-sparc/topology.h +++ b/trunk/arch/sparc/include/asm/topology.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_TOPOLOGY_H #define ___ASM_SPARC_TOPOLOGY_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/topology_32.h b/trunk/arch/sparc/include/asm/topology_32.h similarity index 100% rename from trunk/include/asm-sparc/topology_32.h rename to trunk/arch/sparc/include/asm/topology_32.h diff --git a/trunk/include/asm-sparc/topology_64.h b/trunk/arch/sparc/include/asm/topology_64.h similarity index 100% rename from trunk/include/asm-sparc/topology_64.h rename to trunk/arch/sparc/include/asm/topology_64.h diff --git a/trunk/include/asm-sparc/traps.h b/trunk/arch/sparc/include/asm/traps.h similarity index 100% rename from trunk/include/asm-sparc/traps.h rename to trunk/arch/sparc/include/asm/traps.h diff --git a/trunk/include/asm-sparc/tsb.h b/trunk/arch/sparc/include/asm/tsb.h similarity index 100% rename from trunk/include/asm-sparc/tsb.h rename to trunk/arch/sparc/include/asm/tsb.h diff --git a/trunk/include/asm-sparc/tsunami.h b/trunk/arch/sparc/include/asm/tsunami.h similarity index 100% rename from trunk/include/asm-sparc/tsunami.h rename to trunk/arch/sparc/include/asm/tsunami.h diff --git a/trunk/include/asm-sparc/ttable.h b/trunk/arch/sparc/include/asm/ttable.h similarity index 100% rename from trunk/include/asm-sparc/ttable.h rename to trunk/arch/sparc/include/asm/ttable.h diff --git a/trunk/include/asm-sparc/turbosparc.h b/trunk/arch/sparc/include/asm/turbosparc.h similarity index 100% rename from trunk/include/asm-sparc/turbosparc.h rename to trunk/arch/sparc/include/asm/turbosparc.h diff --git a/trunk/include/asm-sparc/types.h b/trunk/arch/sparc/include/asm/types.h similarity index 100% rename from trunk/include/asm-sparc/types.h rename to trunk/arch/sparc/include/asm/types.h diff --git a/trunk/include/asm-sparc/uaccess.h b/trunk/arch/sparc/include/asm/uaccess.h similarity index 65% rename from trunk/include/asm-sparc/uaccess.h rename to trunk/arch/sparc/include/asm/uaccess.h index 424facce5238..e88fbe5c0457 100644 --- a/trunk/include/asm-sparc/uaccess.h +++ b/trunk/arch/sparc/include/asm/uaccess.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_UACCESS_H #define ___ASM_SPARC_UACCESS_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/uaccess_32.h b/trunk/arch/sparc/include/asm/uaccess_32.h similarity index 100% rename from trunk/include/asm-sparc/uaccess_32.h rename to trunk/arch/sparc/include/asm/uaccess_32.h diff --git a/trunk/include/asm-sparc/uaccess_64.h b/trunk/arch/sparc/include/asm/uaccess_64.h similarity index 100% rename from trunk/include/asm-sparc/uaccess_64.h rename to trunk/arch/sparc/include/asm/uaccess_64.h diff --git a/trunk/include/asm-sparc/uctx.h b/trunk/arch/sparc/include/asm/uctx.h similarity index 100% rename from trunk/include/asm-sparc/uctx.h rename to trunk/arch/sparc/include/asm/uctx.h diff --git a/trunk/include/asm-sparc/unaligned.h b/trunk/arch/sparc/include/asm/unaligned.h similarity index 100% rename from trunk/include/asm-sparc/unaligned.h rename to trunk/arch/sparc/include/asm/unaligned.h diff --git a/trunk/include/asm-sparc/unistd.h b/trunk/arch/sparc/include/asm/unistd.h similarity index 65% rename from trunk/include/asm-sparc/unistd.h rename to trunk/arch/sparc/include/asm/unistd.h index 3c2609618a09..4207fb362da0 100644 --- a/trunk/include/asm-sparc/unistd.h +++ b/trunk/arch/sparc/include/asm/unistd.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_UNISTD_H #define ___ASM_SPARC_UNISTD_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/unistd_32.h b/trunk/arch/sparc/include/asm/unistd_32.h similarity index 100% rename from trunk/include/asm-sparc/unistd_32.h rename to trunk/arch/sparc/include/asm/unistd_32.h diff --git a/trunk/include/asm-sparc/unistd_64.h b/trunk/arch/sparc/include/asm/unistd_64.h similarity index 100% rename from trunk/include/asm-sparc/unistd_64.h rename to trunk/arch/sparc/include/asm/unistd_64.h diff --git a/trunk/include/asm-sparc/upa.h b/trunk/arch/sparc/include/asm/upa.h similarity index 100% rename from trunk/include/asm-sparc/upa.h rename to trunk/arch/sparc/include/asm/upa.h diff --git a/trunk/include/asm-sparc/user.h b/trunk/arch/sparc/include/asm/user.h similarity index 100% rename from trunk/include/asm-sparc/user.h rename to trunk/arch/sparc/include/asm/user.h diff --git a/trunk/include/asm-sparc/utrap.h b/trunk/arch/sparc/include/asm/utrap.h similarity index 97% rename from trunk/include/asm-sparc/utrap.h rename to trunk/arch/sparc/include/asm/utrap.h index 9da37babbe5b..b10e527c22d9 100644 --- a/trunk/include/asm-sparc/utrap.h +++ b/trunk/arch/sparc/include/asm/utrap.h @@ -1,5 +1,5 @@ /* - * include/asm-sparc64/utrap.h + * include/asm/utrap.h * * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) */ diff --git a/trunk/include/asm-sparc/vac-ops.h b/trunk/arch/sparc/include/asm/vac-ops.h similarity index 100% rename from trunk/include/asm-sparc/vac-ops.h rename to trunk/arch/sparc/include/asm/vac-ops.h diff --git a/trunk/include/asm-sparc/vaddrs.h b/trunk/arch/sparc/include/asm/vaddrs.h similarity index 97% rename from trunk/include/asm-sparc/vaddrs.h rename to trunk/arch/sparc/include/asm/vaddrs.h index a22fed5a3c6b..541e13755cec 100644 --- a/trunk/include/asm-sparc/vaddrs.h +++ b/trunk/arch/sparc/include/asm/vaddrs.h @@ -4,7 +4,7 @@ #include /* - * asm-sparc/vaddrs.h: Here we define the virtual addresses at + * asm/vaddrs.h: Here we define the virtual addresses at * which important things will be mapped. * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) diff --git a/trunk/include/asm-sparc/vfc_ioctls.h b/trunk/arch/sparc/include/asm/vfc_ioctls.h similarity index 100% rename from trunk/include/asm-sparc/vfc_ioctls.h rename to trunk/arch/sparc/include/asm/vfc_ioctls.h diff --git a/trunk/include/asm-sparc/vga.h b/trunk/arch/sparc/include/asm/vga.h similarity index 100% rename from trunk/include/asm-sparc/vga.h rename to trunk/arch/sparc/include/asm/vga.h diff --git a/trunk/include/asm-sparc/viking.h b/trunk/arch/sparc/include/asm/viking.h similarity index 100% rename from trunk/include/asm-sparc/viking.h rename to trunk/arch/sparc/include/asm/viking.h diff --git a/trunk/include/asm-sparc/vio.h b/trunk/arch/sparc/include/asm/vio.h similarity index 100% rename from trunk/include/asm-sparc/vio.h rename to trunk/arch/sparc/include/asm/vio.h diff --git a/trunk/include/asm-sparc/visasm.h b/trunk/arch/sparc/include/asm/visasm.h similarity index 100% rename from trunk/include/asm-sparc/visasm.h rename to trunk/arch/sparc/include/asm/visasm.h diff --git a/trunk/include/asm-sparc/watchdog.h b/trunk/arch/sparc/include/asm/watchdog.h similarity index 100% rename from trunk/include/asm-sparc/watchdog.h rename to trunk/arch/sparc/include/asm/watchdog.h diff --git a/trunk/include/asm-sparc/winmacro.h b/trunk/arch/sparc/include/asm/winmacro.h similarity index 100% rename from trunk/include/asm-sparc/winmacro.h rename to trunk/arch/sparc/include/asm/winmacro.h diff --git a/trunk/include/asm-sparc/xor.h b/trunk/arch/sparc/include/asm/xor.h similarity index 66% rename from trunk/include/asm-sparc/xor.h rename to trunk/arch/sparc/include/asm/xor.h index 35089a838c3f..8ed591c7db2d 100644 --- a/trunk/include/asm-sparc/xor.h +++ b/trunk/arch/sparc/include/asm/xor.h @@ -1,8 +1,8 @@ #ifndef ___ASM_SPARC_XOR_H #define ___ASM_SPARC_XOR_H #if defined(__sparc__) && defined(__arch64__) -#include +#include #else -#include +#include #endif #endif diff --git a/trunk/include/asm-sparc/xor_32.h b/trunk/arch/sparc/include/asm/xor_32.h similarity index 99% rename from trunk/include/asm-sparc/xor_32.h rename to trunk/arch/sparc/include/asm/xor_32.h index f34b2cfa8206..44bfa0787f3f 100644 --- a/trunk/include/asm-sparc/xor_32.h +++ b/trunk/arch/sparc/include/asm/xor_32.h @@ -1,5 +1,5 @@ /* - * include/asm-sparc/xor.h + * include/asm/xor.h * * Optimized RAID-5 checksumming functions for 32-bit Sparc. * diff --git a/trunk/include/asm-sparc/xor_64.h b/trunk/arch/sparc/include/asm/xor_64.h similarity index 98% rename from trunk/include/asm-sparc/xor_64.h rename to trunk/arch/sparc/include/asm/xor_64.h index a0233884fc94..bee4bf4be3af 100644 --- a/trunk/include/asm-sparc/xor_64.h +++ b/trunk/arch/sparc/include/asm/xor_64.h @@ -1,5 +1,5 @@ /* - * include/asm-sparc64/xor.h + * include/asm/xor.h * * High speed xor_block operation for RAID4/5 utilizing the * UltraSparc Visual Instruction Set and Niagara block-init diff --git a/trunk/arch/sparc64/kernel/compat_audit.c b/trunk/arch/sparc64/kernel/compat_audit.c index c1979482aa92..c831b0a4e660 100644 --- a/trunk/arch/sparc64/kernel/compat_audit.c +++ b/trunk/arch/sparc64/kernel/compat_audit.c @@ -1,4 +1,4 @@ -#include +#include unsigned sparc32_dir_class[] = { #include diff --git a/trunk/arch/x86/kernel/head_32.S b/trunk/arch/x86/kernel/head_32.S index a7010c3a377a..f67e93441caf 100644 --- a/trunk/arch/x86/kernel/head_32.S +++ b/trunk/arch/x86/kernel/head_32.S @@ -456,6 +456,9 @@ is386: movl $2,%ecx # set MP 1: #endif /* CONFIG_SMP */ jmp *(initial_code) +.align 4 +ENTRY(initial_code) + .long i386_start_kernel /* * We depend on ET to be correct. This checks for 287/387. @@ -598,11 +601,6 @@ ignore_int: #endif iret -.section .cpuinit.data,"wa" -.align 4 -ENTRY(initial_code) - .long i386_start_kernel - .section .text /* * Real beginning of normal "text" segment diff --git a/trunk/drivers/acpi/processor_idle.c b/trunk/drivers/acpi/processor_idle.c index 283c08f5f4d4..b7f2963693a7 100644 --- a/trunk/drivers/acpi/processor_idle.c +++ b/trunk/drivers/acpi/processor_idle.c @@ -1332,15 +1332,9 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr) if (!pr->flags.power_setup_done) return -ENODEV; - /* - * Fall back to the default idle loop, when pm_idle_save had - * been initialized. - */ - if (pm_idle_save) { - pm_idle = pm_idle_save; - /* Relies on interrupts forcing exit from idle. */ - synchronize_sched(); - } + /* Fall back to the default idle loop */ + pm_idle = pm_idle_save; + synchronize_sched(); /* Relies on interrupts forcing exit from idle. */ pr->flags.power = 0; result = acpi_processor_get_power_info(pr); @@ -1902,8 +1896,7 @@ int acpi_processor_power_exit(struct acpi_processor *pr, /* Unregister the idle handler when processor #0 is removed. */ if (pr->id == 0) { - if (pm_idle_save) - pm_idle = pm_idle_save; + pm_idle = pm_idle_save; /* * We are about to unload the current idle thread pm callback diff --git a/trunk/drivers/ata/pata_ixp4xx_cf.c b/trunk/drivers/ata/pata_ixp4xx_cf.c index 2014253f6c88..de8d186f5abf 100644 --- a/trunk/drivers/ata/pata_ixp4xx_cf.c +++ b/trunk/drivers/ata/pata_ixp4xx_cf.c @@ -169,7 +169,7 @@ static __devinit int ixp4xx_pata_probe(struct platform_device *pdev) irq = platform_get_irq(pdev, 0); if (irq) - set_irq_type(irq, IRQ_TYPE_EDGE_RISING); + set_irq_type(irq, IRQT_RISING); /* Setup expansion bus chip selects */ *data->cs0_cfg = data->cs0_bits; diff --git a/trunk/drivers/base/memory.c b/trunk/drivers/base/memory.c index af0d175c025d..3ad49a00029f 100644 --- a/trunk/drivers/base/memory.c +++ b/trunk/drivers/base/memory.c @@ -103,8 +103,7 @@ static ssize_t show_mem_phys_index(struct sys_device *dev, /* * Show whether the section of memory is likely to be hot-removable */ -static ssize_t show_mem_removable(struct sys_device *dev, - struct sysdev_attribute *attr, char *buf) +static ssize_t show_mem_removable(struct sys_device *dev, char *buf) { unsigned long start_pfn; int ret; diff --git a/trunk/drivers/char/nwflash.c b/trunk/drivers/char/nwflash.c index 006be92ee3f3..f9f72a211292 100644 --- a/trunk/drivers/char/nwflash.c +++ b/trunk/drivers/char/nwflash.c @@ -125,15 +125,15 @@ static ssize_t flash_read(struct file *file, char __user *buf, size_t size, ssize_t ret; if (flashdebug) - printk(KERN_DEBUG "flash_read: flash_read: offset=0x%llx, " - "buffer=%p, count=0x%zx.\n", *ppos, buf, size); + printk(KERN_DEBUG "flash_read: flash_read: offset=0x%lX, " + "buffer=%p, count=0x%X.\n", p, buf, count); /* * We now lock against reads and writes. --rmk */ if (mutex_lock_interruptible(&nwflash_mutex)) return -ERESTARTSYS; - ret = simple_read_from_buffer(buf, size, ppos, (void *)FLASH_BASE, gbFlashSize); + ret = simple_read_from_buffer(buf, size, ppos, FLASH_BASE, gbFlashSize); mutex_unlock(&nwflash_mutex); return ret; diff --git a/trunk/drivers/char/pcmcia/ipwireless/hardware.c b/trunk/drivers/char/pcmcia/ipwireless/hardware.c index 7d500f82195a..929101ecbae2 100644 --- a/trunk/drivers/char/pcmcia/ipwireless/hardware.c +++ b/trunk/drivers/char/pcmcia/ipwireless/hardware.c @@ -30,11 +30,11 @@ static void ipw_send_setup_packet(struct ipw_hardware *hw); static void handle_received_SETUP_packet(struct ipw_hardware *ipw, unsigned int address, - const unsigned char *data, int len, + unsigned char *data, int len, int is_last); static void ipwireless_setup_timer(unsigned long data); static void handle_received_CTRL_packet(struct ipw_hardware *hw, - unsigned int channel_idx, const unsigned char *data, int len); + unsigned int channel_idx, unsigned char *data, int len); /*#define TIMING_DIAGNOSTICS*/ @@ -79,7 +79,8 @@ static void report_timing(void) timing_stats.last_report_time = jiffies; if (!first) printk(KERN_INFO IPWIRELESS_PCCARD_NAME - ": %u us elapsed - read %lu bytes in %u us, wrote %lu bytes in %u us\n", + ": %u us elapsed - read %lu bytes in %u us, " + "wrote %lu bytes in %u us\n", jiffies_to_usecs(since), timing_stats.read_bytes, jiffies_to_usecs(timing_stats.read_time), @@ -132,17 +133,29 @@ enum { #define NL_FOLLOWING_PACKET_HEADER_SIZE 1 struct nl_first_packet_header { +#if defined(__BIG_ENDIAN_BITFIELD) + unsigned char packet_rank:2; + unsigned char address:3; + unsigned char protocol:3; +#else unsigned char protocol:3; unsigned char address:3; unsigned char packet_rank:2; +#endif unsigned char length_lsb; unsigned char length_msb; }; struct nl_packet_header { +#if defined(__BIG_ENDIAN_BITFIELD) + unsigned char packet_rank:2; + unsigned char address:3; + unsigned char protocol:3; +#else unsigned char protocol:3; unsigned char address:3; unsigned char packet_rank:2; +#endif }; /* Value of 'packet_rank' above */ @@ -214,12 +227,15 @@ struct MEMINFREG { unsigned short memreg_tx_new; /* TX2 (new) Register (R/W) */ }; +#define IODMADPR 0x00 /* DMA Data Port Register (R/W) */ + #define CARD_PRESENT_VALUE (0xBEEFCAFEUL) #define MEMTX_TX 0x0001 #define MEMRX_RX 0x0001 #define MEMRX_RX_DONE 0x0001 #define MEMRX_PCINTACKK 0x0001 +#define MEMRX_MEMSPURIOUSINT 0x0001 #define NL_NUM_OF_PRIORITIES 3 #define NL_NUM_OF_PROTOCOLS 3 @@ -229,7 +245,7 @@ struct ipw_hardware { unsigned int base_port; short hw_version; unsigned short ll_mtu; - spinlock_t lock; + spinlock_t spinlock; int initializing; int init_loops; @@ -370,52 +386,26 @@ static void dump_data_bytes(const char *type, const unsigned char *data, length < DUMP_MAX_BYTES ? length : DUMP_MAX_BYTES); } -static void swap_packet_bitfield_to_le(unsigned char *data) -{ -#ifdef __BIG_ENDIAN_BITFIELD - unsigned char tmp = *data, ret = 0; - - /* - * transform bits from aa.bbb.ccc to ccc.bbb.aa - */ - ret |= tmp & 0xc0 >> 6; - ret |= tmp & 0x38 >> 1; - ret |= tmp & 0x07 << 5; - *data = ret & 0xff; -#endif -} - -static void swap_packet_bitfield_from_le(unsigned char *data) -{ -#ifdef __BIG_ENDIAN_BITFIELD - unsigned char tmp = *data, ret = 0; - - /* - * transform bits from ccc.bbb.aa to aa.bbb.ccc - */ - ret |= tmp & 0xe0 >> 5; - ret |= tmp & 0x1c << 1; - ret |= tmp & 0x03 << 6; - *data = ret & 0xff; -#endif -} - -static void do_send_fragment(struct ipw_hardware *hw, unsigned char *data, +static int do_send_fragment(struct ipw_hardware *hw, const unsigned char *data, unsigned length) { - unsigned i; + int i; unsigned long flags; start_timing(); - BUG_ON(length > hw->ll_mtu); + + if (length == 0) + return 0; + + if (length > hw->ll_mtu) + return -1; if (ipwireless_debug) dump_data_bytes("send", data, length); - spin_lock_irqsave(&hw->lock, flags); + spin_lock_irqsave(&hw->spinlock, flags); hw->tx_ready = 0; - swap_packet_bitfield_to_le(data); if (hw->hw_version == HW_VERSION_1) { outw((unsigned short) length, hw->base_port + IODWR); @@ -424,7 +414,7 @@ static void do_send_fragment(struct ipw_hardware *hw, unsigned char *data, unsigned short d = data[i]; __le16 raw_data; - if (i + 1 < length) + if (likely(i + 1 < length)) d |= data[i + 1] << 8; raw_data = cpu_to_le16(d); outw(raw_data, hw->base_port + IODWR); @@ -432,30 +422,32 @@ static void do_send_fragment(struct ipw_hardware *hw, unsigned char *data, outw(DCR_TXDONE, hw->base_port + IODCR); } else if (hw->hw_version == HW_VERSION_2) { - outw((unsigned short) length, hw->base_port); + outw((unsigned short) length, hw->base_port + IODMADPR); for (i = 0; i < length; i += 2) { unsigned short d = data[i]; __le16 raw_data; - if (i + 1 < length) + if ((i + 1 < length)) d |= data[i + 1] << 8; raw_data = cpu_to_le16(d); - outw(raw_data, hw->base_port); + outw(raw_data, hw->base_port + IODMADPR); } while ((i & 3) != 2) { - outw((unsigned short) 0xDEAD, hw->base_port); + outw((unsigned short) 0xDEAD, hw->base_port + IODMADPR); i += 2; } writew(MEMRX_RX, &hw->memory_info_regs->memreg_rx); } - spin_unlock_irqrestore(&hw->lock, flags); + spin_unlock_irqrestore(&hw->spinlock, flags); end_write_timing(length); + + return 0; } -static void do_send_packet(struct ipw_hardware *hw, struct ipw_tx_packet *packet) +static int do_send_packet(struct ipw_hardware *hw, struct ipw_tx_packet *packet) { unsigned short fragment_data_len; unsigned short data_left = packet->length - packet->offset; @@ -470,10 +462,6 @@ static void do_send_packet(struct ipw_hardware *hw, struct ipw_tx_packet *packet if (data_left < fragment_data_len) fragment_data_len = data_left; - /* - * hdr_first is now in machine bitfield order, which will be swapped - * to le just before it goes to hw - */ pkt.hdr_first.protocol = packet->protocol; pkt.hdr_first.address = packet->dest_addr; pkt.hdr_first.packet_rank = 0; @@ -505,23 +493,25 @@ static void do_send_packet(struct ipw_hardware *hw, struct ipw_tx_packet *packet */ unsigned long flags; - spin_lock_irqsave(&hw->lock, flags); + spin_lock_irqsave(&hw->spinlock, flags); list_add(&packet->queue, &hw->tx_queue[0]); hw->tx_queued++; - spin_unlock_irqrestore(&hw->lock, flags); + spin_unlock_irqrestore(&hw->spinlock, flags); } else { if (packet->packet_callback) packet->packet_callback(packet->callback_data, packet->length); kfree(packet); } + + return 0; } static void ipw_setup_hardware(struct ipw_hardware *hw) { unsigned long flags; - spin_lock_irqsave(&hw->lock, flags); + spin_lock_irqsave(&hw->spinlock, flags); if (hw->hw_version == HW_VERSION_1) { /* Reset RX FIFO */ outw(DCR_RXRESET, hw->base_port + IODCR); @@ -540,7 +530,7 @@ static void ipw_setup_hardware(struct ipw_hardware *hw) csr |= 1; writew(csr, &hw->memregs_CCR->reg_config_and_status); } - spin_unlock_irqrestore(&hw->lock, flags); + spin_unlock_irqrestore(&hw->spinlock, flags); } /* @@ -559,23 +549,28 @@ static struct ipw_rx_packet *pool_allocate(struct ipw_hardware *hw, if (!packet) { unsigned long flags; - spin_lock_irqsave(&hw->lock, flags); + /* + * If this is the first fragment, then we will need to fetch a + * packet to put it in. + */ + spin_lock_irqsave(&hw->spinlock, flags); + /* If we have one in our pool, then pull it out. */ if (!list_empty(&hw->rx_pool)) { packet = list_first_entry(&hw->rx_pool, struct ipw_rx_packet, queue); - hw->rx_pool_size--; - spin_unlock_irqrestore(&hw->lock, flags); list_del(&packet->queue); + hw->rx_pool_size--; + spin_unlock_irqrestore(&hw->spinlock, flags); } else { - const int min_capacity = - ipwireless_ppp_mru(hw->network + 2); + /* Otherwise allocate a new one. */ + static int min_capacity = 256; int new_capacity; - spin_unlock_irqrestore(&hw->lock, flags); + spin_unlock_irqrestore(&hw->spinlock, flags); new_capacity = - (minimum_free_space > min_capacity - ? minimum_free_space - : min_capacity); + minimum_free_space > min_capacity + ? minimum_free_space + : min_capacity; packet = kmalloc(sizeof(struct ipw_rx_packet) + new_capacity, GFP_ATOMIC); if (!packet) @@ -585,6 +580,10 @@ static struct ipw_rx_packet *pool_allocate(struct ipw_hardware *hw, packet->length = 0; } + /* + * If this packet does not have sufficient capacity for the data we + * want to add, then make it bigger. + */ if (packet->length + minimum_free_space > packet->capacity) { struct ipw_rx_packet *old_packet = packet; @@ -611,15 +610,13 @@ static void pool_free(struct ipw_hardware *hw, struct ipw_rx_packet *packet) kfree(packet); else { hw->rx_pool_size++; - list_add(&packet->queue, &hw->rx_pool); + list_add_tail(&packet->queue, &hw->rx_pool); } } static void queue_received_packet(struct ipw_hardware *hw, - unsigned int protocol, - unsigned int address, - const unsigned char *data, int length, - int is_last) + unsigned int protocol, unsigned int address, + unsigned char *data, int length, int is_last) { unsigned int channel_idx = address - 1; struct ipw_rx_packet *packet = NULL; @@ -661,9 +658,9 @@ static void queue_received_packet(struct ipw_hardware *hw, packet = *assem; *assem = NULL; /* Count queued DATA bytes only */ - spin_lock_irqsave(&hw->lock, flags); + spin_lock_irqsave(&hw->spinlock, flags); hw->rx_bytes_queued += packet->length; - spin_unlock_irqrestore(&hw->lock, flags); + spin_unlock_irqrestore(&hw->spinlock, flags); } } else { /* If it's a CTRL packet, don't assemble, just queue it. */ @@ -685,13 +682,13 @@ static void queue_received_packet(struct ipw_hardware *hw, * network layer. */ if (packet) { - spin_lock_irqsave(&hw->lock, flags); + spin_lock_irqsave(&hw->spinlock, flags); list_add_tail(&packet->queue, &hw->rx_queue); /* Block reception of incoming packets if queue is full. */ hw->blocking_rx = - (hw->rx_bytes_queued >= IPWIRELESS_RX_QUEUE_SIZE); + hw->rx_bytes_queued >= IPWIRELESS_RX_QUEUE_SIZE; - spin_unlock_irqrestore(&hw->lock, flags); + spin_unlock_irqrestore(&hw->spinlock, flags); schedule_work(&hw->work_rx); } } @@ -705,7 +702,7 @@ static void ipw_receive_data_work(struct work_struct *work_rx) container_of(work_rx, struct ipw_hardware, work_rx); unsigned long flags; - spin_lock_irqsave(&hw->lock, flags); + spin_lock_irqsave(&hw->spinlock, flags); while (!list_empty(&hw->rx_queue)) { struct ipw_rx_packet *packet = list_first_entry(&hw->rx_queue, @@ -723,7 +720,7 @@ static void ipw_receive_data_work(struct work_struct *work_rx) if (packet->protocol == TL_PROTOCOLID_COM_DATA) { if (hw->network != NULL) { /* If the network hasn't been disconnected. */ - spin_unlock_irqrestore(&hw->lock, flags); + spin_unlock_irqrestore(&hw->spinlock, flags); /* * This must run unlocked due to tty processing * and mutex locking @@ -734,7 +731,7 @@ static void ipw_receive_data_work(struct work_struct *work_rx) (unsigned char *)packet + sizeof(struct ipw_rx_packet), packet->length); - spin_lock_irqsave(&hw->lock, flags); + spin_lock_irqsave(&hw->spinlock, flags); } /* Count queued DATA bytes only */ hw->rx_bytes_queued -= packet->length; @@ -758,15 +755,15 @@ static void ipw_receive_data_work(struct work_struct *work_rx) if (hw->shutting_down) break; } - spin_unlock_irqrestore(&hw->lock, flags); + spin_unlock_irqrestore(&hw->spinlock, flags); } static void handle_received_CTRL_packet(struct ipw_hardware *hw, unsigned int channel_idx, - const unsigned char *data, int len) + unsigned char *data, int len) { - const struct ipw_control_packet_body *body = - (const struct ipw_control_packet_body *) data; + struct ipw_control_packet_body *body = + (struct ipw_control_packet_body *) data; unsigned int changed_mask; if (len != sizeof(struct ipw_control_packet_body)) { @@ -808,13 +805,13 @@ static void handle_received_CTRL_packet(struct ipw_hardware *hw, } static void handle_received_packet(struct ipw_hardware *hw, - const union nl_packet *packet, + union nl_packet *packet, unsigned short len) { unsigned int protocol = packet->hdr.protocol; unsigned int address = packet->hdr.address; unsigned int header_length; - const unsigned char *data; + unsigned char *data; unsigned int data_len; int is_last = packet->hdr.packet_rank & NL_LAST_PACKET; @@ -853,7 +850,7 @@ static void acknowledge_data_read(struct ipw_hardware *hw) static void do_receive_packet(struct ipw_hardware *hw) { unsigned len; - unsigned i; + unsigned int i; unsigned char pkt[LL_MTU_MAX]; start_timing(); @@ -862,7 +859,8 @@ static void do_receive_packet(struct ipw_hardware *hw) len = inw(hw->base_port + IODRR); if (len > hw->ll_mtu) { printk(KERN_INFO IPWIRELESS_PCCARD_NAME - ": received a packet of %u bytes - longer than the MTU!\n", len); + ": received a packet of %u bytes - " + "longer than the MTU!\n", len); outw(DCR_RXDONE | DCR_RXRESET, hw->base_port + IODCR); return; } @@ -875,17 +873,18 @@ static void do_receive_packet(struct ipw_hardware *hw) pkt[i + 1] = (unsigned char) (data >> 8); } } else { - len = inw(hw->base_port); + len = inw(hw->base_port + IODMADPR); if (len > hw->ll_mtu) { printk(KERN_INFO IPWIRELESS_PCCARD_NAME - ": received a packet of %u bytes - longer than the MTU!\n", len); + ": received a packet of %u bytes - " + "longer than the MTU!\n", len); writew(MEMRX_PCINTACKK, &hw->memory_info_regs->memreg_pc_interrupt_ack); return; } for (i = 0; i < len; i += 2) { - __le16 raw_data = inw(hw->base_port); + __le16 raw_data = inw(hw->base_port + IODMADPR); unsigned short data = le16_to_cpu(raw_data); pkt[i] = (unsigned char) data; @@ -893,15 +892,13 @@ static void do_receive_packet(struct ipw_hardware *hw) } while ((i & 3) != 2) { - inw(hw->base_port); + inw(hw->base_port + IODMADPR); i += 2; } } acknowledge_data_read(hw); - swap_packet_bitfield_from_le(pkt); - if (ipwireless_debug) dump_data_bytes("recv", pkt, len); @@ -919,7 +916,8 @@ static int get_current_packet_priority(struct ipw_hardware *hw) * until setup is complete. */ return (hw->to_setup || hw->initializing - ? PRIO_SETUP + 1 : NL_NUM_OF_PRIORITIES); + ? PRIO_SETUP + 1 : + NL_NUM_OF_PRIORITIES); } /* @@ -930,17 +928,17 @@ static int get_packets_from_hw(struct ipw_hardware *hw) int received = 0; unsigned long flags; - spin_lock_irqsave(&hw->lock, flags); + spin_lock_irqsave(&hw->spinlock, flags); while (hw->rx_ready && !hw->blocking_rx) { received = 1; hw->rx_ready--; - spin_unlock_irqrestore(&hw->lock, flags); + spin_unlock_irqrestore(&hw->spinlock, flags); do_receive_packet(hw); - spin_lock_irqsave(&hw->lock, flags); + spin_lock_irqsave(&hw->spinlock, flags); } - spin_unlock_irqrestore(&hw->lock, flags); + spin_unlock_irqrestore(&hw->spinlock, flags); return received; } @@ -956,7 +954,7 @@ static int send_pending_packet(struct ipw_hardware *hw, int priority_limit) int more_to_send = 0; unsigned long flags; - spin_lock_irqsave(&hw->lock, flags); + spin_lock_irqsave(&hw->spinlock, flags); if (hw->tx_queued && hw->tx_ready) { int priority; struct ipw_tx_packet *packet = NULL; @@ -977,17 +975,17 @@ static int send_pending_packet(struct ipw_hardware *hw, int priority_limit) } if (!packet) { hw->tx_queued = 0; - spin_unlock_irqrestore(&hw->lock, flags); + spin_unlock_irqrestore(&hw->spinlock, flags); return 0; } - spin_unlock_irqrestore(&hw->lock, flags); + spin_unlock_irqrestore(&hw->spinlock, flags); /* Send */ do_send_packet(hw, packet); /* Check if more to send */ - spin_lock_irqsave(&hw->lock, flags); + spin_lock_irqsave(&hw->spinlock, flags); for (priority = 0; priority < priority_limit; priority++) if (!list_empty(&hw->tx_queue[priority])) { more_to_send = 1; @@ -997,7 +995,7 @@ static int send_pending_packet(struct ipw_hardware *hw, int priority_limit) if (!more_to_send) hw->tx_queued = 0; } - spin_unlock_irqrestore(&hw->lock, flags); + spin_unlock_irqrestore(&hw->spinlock, flags); return more_to_send; } @@ -1010,9 +1008,9 @@ static void ipwireless_do_tasklet(unsigned long hw_) struct ipw_hardware *hw = (struct ipw_hardware *) hw_; unsigned long flags; - spin_lock_irqsave(&hw->lock, flags); + spin_lock_irqsave(&hw->spinlock, flags); if (hw->shutting_down) { - spin_unlock_irqrestore(&hw->lock, flags); + spin_unlock_irqrestore(&hw->spinlock, flags); return; } @@ -1021,7 +1019,7 @@ static void ipwireless_do_tasklet(unsigned long hw_) * Initial setup data sent to hardware */ hw->to_setup = 2; - spin_unlock_irqrestore(&hw->lock, flags); + spin_unlock_irqrestore(&hw->spinlock, flags); ipw_setup_hardware(hw); ipw_send_setup_packet(hw); @@ -1032,7 +1030,7 @@ static void ipwireless_do_tasklet(unsigned long hw_) int priority_limit = get_current_packet_priority(hw); int again; - spin_unlock_irqrestore(&hw->lock, flags); + spin_unlock_irqrestore(&hw->spinlock, flags); do { again = send_pending_packet(hw, priority_limit); @@ -1070,16 +1068,16 @@ static irqreturn_t ipwireless_handle_v1_interrupt(int irq, /* Transmit complete. */ if (irqn & IR_TXINTR) { ack |= IR_TXINTR; - spin_lock_irqsave(&hw->lock, flags); + spin_lock_irqsave(&hw->spinlock, flags); hw->tx_ready = 1; - spin_unlock_irqrestore(&hw->lock, flags); + spin_unlock_irqrestore(&hw->spinlock, flags); } /* Received data */ if (irqn & IR_RXINTR) { ack |= IR_RXINTR; - spin_lock_irqsave(&hw->lock, flags); + spin_lock_irqsave(&hw->spinlock, flags); hw->rx_ready++; - spin_unlock_irqrestore(&hw->lock, flags); + spin_unlock_irqrestore(&hw->spinlock, flags); } if (ack != 0) { outw(ack, hw->base_port + IOIR); @@ -1130,8 +1128,9 @@ static irqreturn_t ipwireless_handle_v2_v3_interrupt(int irq, } else { return IRQ_NONE; } - } else + } else { return IRQ_NONE; + } } /* @@ -1150,9 +1149,9 @@ static irqreturn_t ipwireless_handle_v2_v3_interrupt(int irq, if (hw->serial_number_detected) { if (memtx_serial != hw->last_memtx_serial) { hw->last_memtx_serial = memtx_serial; - spin_lock_irqsave(&hw->lock, flags); + spin_lock_irqsave(&hw->spinlock, flags); hw->rx_ready++; - spin_unlock_irqrestore(&hw->lock, flags); + spin_unlock_irqrestore(&hw->spinlock, flags); rx = 1; } else /* Ignore 'Timer Recovery' duplicates. */ @@ -1167,18 +1166,18 @@ static irqreturn_t ipwireless_handle_v2_v3_interrupt(int irq, printk(KERN_DEBUG IPWIRELESS_PCCARD_NAME ": memreg_tx serial num detected\n"); - spin_lock_irqsave(&hw->lock, flags); + spin_lock_irqsave(&hw->spinlock, flags); hw->rx_ready++; - spin_unlock_irqrestore(&hw->lock, flags); + spin_unlock_irqrestore(&hw->spinlock, flags); } rx = 1; } } if (memrxdone & MEMRX_RX_DONE) { writew(0, &hw->memory_info_regs->memreg_rx_done); - spin_lock_irqsave(&hw->lock, flags); + spin_lock_irqsave(&hw->spinlock, flags); hw->tx_ready = 1; - spin_unlock_irqrestore(&hw->lock, flags); + spin_unlock_irqrestore(&hw->spinlock, flags); tx = 1; } if (tx) @@ -1196,7 +1195,8 @@ static irqreturn_t ipwireless_handle_v2_v3_interrupt(int irq, ": spurious interrupt - new_tx mode\n"); else { printk(KERN_WARNING IPWIRELESS_PCCARD_NAME - ": no valid memreg_tx value - switching to the old memreg_tx\n"); + ": no valid memreg_tx value - " + "switching to the old memreg_tx\n"); hw->memreg_tx = &hw->memory_info_regs->memreg_tx_old; try_mem_tx_old = 1; @@ -1211,7 +1211,7 @@ static irqreturn_t ipwireless_handle_v2_v3_interrupt(int irq, return IRQ_HANDLED; } -irqreturn_t ipwireless_interrupt(int irq, void *dev_id) +irqreturn_t ipwireless_interrupt(int irq, void *dev_id, struct pt_regs *regs) { struct ipw_hardware *hw = dev_id; @@ -1226,9 +1226,9 @@ static void flush_packets_to_hw(struct ipw_hardware *hw) int priority_limit; unsigned long flags; - spin_lock_irqsave(&hw->lock, flags); + spin_lock_irqsave(&hw->spinlock, flags); priority_limit = get_current_packet_priority(hw); - spin_unlock_irqrestore(&hw->lock, flags); + spin_unlock_irqrestore(&hw->spinlock, flags); while (send_pending_packet(hw, priority_limit)); } @@ -1238,10 +1238,10 @@ static void send_packet(struct ipw_hardware *hw, int priority, { unsigned long flags; - spin_lock_irqsave(&hw->lock, flags); + spin_lock_irqsave(&hw->spinlock, flags); list_add_tail(&packet->queue, &hw->tx_queue[priority]); hw->tx_queued++; - spin_unlock_irqrestore(&hw->lock, flags); + spin_unlock_irqrestore(&hw->spinlock, flags); flush_packets_to_hw(hw); } @@ -1291,20 +1291,21 @@ static void *alloc_ctrl_packet(int header_size, } int ipwireless_send_packet(struct ipw_hardware *hw, unsigned int channel_idx, - const unsigned char *data, unsigned int length, + unsigned char *data, unsigned int length, void (*callback) (void *cb, unsigned int length), void *callback_data) { struct ipw_tx_packet *packet; - packet = alloc_data_packet(length, (channel_idx + 1), - TL_PROTOCOLID_COM_DATA); + packet = alloc_data_packet(length, + (unsigned char) (channel_idx + 1), + TL_PROTOCOLID_COM_DATA); if (!packet) return -ENOMEM; packet->packet_callback = callback; packet->callback_data = callback_data; - memcpy((unsigned char *) packet + sizeof(struct ipw_tx_packet), data, - length); + memcpy((unsigned char *) packet + + sizeof(struct ipw_tx_packet), data, length); send_packet(hw, PRIO_DATA, packet); return 0; @@ -1320,11 +1321,12 @@ static int set_control_line(struct ipw_hardware *hw, int prio, protocolid = TL_PROTOCOLID_SETUP; packet = alloc_ctrl_packet(sizeof(struct ipw_control_packet), - (channel_idx + 1), protocolid, line); + (unsigned char) (channel_idx + 1), + protocolid, line); if (!packet) return -ENOMEM; packet->header.length = sizeof(struct ipw_control_packet_body); - packet->body.value = (state == 0 ? 0 : 1); + packet->body.value = (unsigned char) (state == 0 ? 0 : 1); send_packet(hw, prio, &packet->header); return 0; } @@ -1502,7 +1504,8 @@ static void handle_setup_get_version_rsp(struct ipw_hardware *hw, if (vers_no == TL_SETUP_VERSION) __handle_setup_get_version_rsp(hw); else - printk(KERN_ERR IPWIRELESS_PCCARD_NAME + printk(KERN_ERR + IPWIRELESS_PCCARD_NAME ": invalid hardware version no %u\n", (unsigned int) vers_no); } @@ -1525,10 +1528,10 @@ static void ipw_send_setup_packet(struct ipw_hardware *hw) static void handle_received_SETUP_packet(struct ipw_hardware *hw, unsigned int address, - const unsigned char *data, int len, + unsigned char *data, int len, int is_last) { - const union ipw_setup_rx_msg *rx_msg = (const union ipw_setup_rx_msg *) data; + union ipw_setup_rx_msg *rx_msg = (union ipw_setup_rx_msg *) data; if (address != ADDR_SETUP_PROT) { printk(KERN_INFO IPWIRELESS_PCCARD_NAME @@ -1626,7 +1629,7 @@ struct ipw_hardware *ipwireless_hardware_create(void) INIT_LIST_HEAD(&hw->rx_queue); INIT_LIST_HEAD(&hw->rx_pool); - spin_lock_init(&hw->lock); + spin_lock_init(&hw->spinlock); tasklet_init(&hw->tasklet, ipwireless_do_tasklet, (unsigned long) hw); INIT_WORK(&hw->work_rx, ipw_receive_data_work); setup_timer(&hw->setup_timer, ipwireless_setup_timer, @@ -1648,8 +1651,8 @@ void ipwireless_init_hardware_v1(struct ipw_hardware *hw, enable_irq(hw->irq); } hw->base_port = base_port; - hw->hw_version = (is_v2_card ? HW_VERSION_2 : HW_VERSION_1); - hw->ll_mtu = (hw->hw_version == HW_VERSION_1 ? LL_MTU_V1 : LL_MTU_V2); + hw->hw_version = is_v2_card ? HW_VERSION_2 : HW_VERSION_1; + hw->ll_mtu = hw->hw_version == HW_VERSION_1 ? LL_MTU_V1 : LL_MTU_V2; hw->memregs_CCR = (struct MEMCCR __iomem *) ((unsigned short __iomem *) attr_memory + 0x200); hw->memory_info_regs = (struct MEMINFREG __iomem *) common_memory; @@ -1692,10 +1695,10 @@ static void ipwireless_setup_timer(unsigned long data) if (is_card_present(hw)) { unsigned long flags; - spin_lock_irqsave(&hw->lock, flags); + spin_lock_irqsave(&hw->spinlock, flags); hw->to_setup = 1; hw->tx_ready = 1; - spin_unlock_irqrestore(&hw->lock, flags); + spin_unlock_irqrestore(&hw->spinlock, flags); tasklet_schedule(&hw->tasklet); } diff --git a/trunk/drivers/char/pcmcia/ipwireless/hardware.h b/trunk/drivers/char/pcmcia/ipwireless/hardware.h index 90a8590e43b0..19ce5eb266b1 100644 --- a/trunk/drivers/char/pcmcia/ipwireless/hardware.h +++ b/trunk/drivers/char/pcmcia/ipwireless/hardware.h @@ -34,14 +34,14 @@ struct ipw_network; struct ipw_hardware *ipwireless_hardware_create(void); void ipwireless_hardware_free(struct ipw_hardware *hw); -irqreturn_t ipwireless_interrupt(int irq, void *dev_id); +irqreturn_t ipwireless_interrupt(int irq, void *dev_id, struct pt_regs *regs); int ipwireless_set_DTR(struct ipw_hardware *hw, unsigned int channel_idx, int state); int ipwireless_set_RTS(struct ipw_hardware *hw, unsigned int channel_idx, int state); int ipwireless_send_packet(struct ipw_hardware *hw, unsigned int channel_idx, - const unsigned char *data, + unsigned char *data, unsigned int length, void (*packet_sent_callback) (void *cb, unsigned int length), diff --git a/trunk/drivers/char/pcmcia/ipwireless/main.c b/trunk/drivers/char/pcmcia/ipwireless/main.c index 5eca7a99afe6..cc7dcea2d283 100644 --- a/trunk/drivers/char/pcmcia/ipwireless/main.c +++ b/trunk/drivers/char/pcmcia/ipwireless/main.c @@ -49,7 +49,7 @@ static void ipwireless_detach(struct pcmcia_device *link); /* Debug mode: more verbose, print sent/recv bytes */ int ipwireless_debug; int ipwireless_loopback; -int ipwireless_out_queue = 10; +int ipwireless_out_queue = 1; module_param_named(debug, ipwireless_debug, int, 0); module_param_named(loopback, ipwireless_loopback, int, 0); @@ -57,7 +57,7 @@ module_param_named(out_queue, ipwireless_out_queue, int, 0); MODULE_PARM_DESC(debug, "switch on debug messages [0]"); MODULE_PARM_DESC(loopback, "debug: enable ras_raw channel [0]"); -MODULE_PARM_DESC(out_queue, "debug: set size of outgoing PPP queue [10]"); +MODULE_PARM_DESC(out_queue, "debug: set size of outgoing queue [1]"); /* Executes in process context. */ static void signalled_reboot_work(struct work_struct *work_reboot) @@ -88,6 +88,8 @@ static int config_ipwireless(struct ipw_dev *ipw) unsigned short buf[64]; cisparse_t parse; unsigned short cor_value; + win_req_t request_attr_memory; + win_req_t request_common_memory; memreq_t memreq_attr_memory; memreq_t memreq_common_memory; @@ -186,9 +188,6 @@ static int config_ipwireless(struct ipw_dev *ipw) goto exit0; } - request_region(link->io.BasePort1, link->io.NumPorts1, - IPWIRELESS_PCCARD_NAME); - /* memory settings */ tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; @@ -215,16 +214,16 @@ static int config_ipwireless(struct ipw_dev *ipw) } if (parse.cftable_entry.mem.nwin > 0) { - ipw->request_common_memory.Attributes = + request_common_memory.Attributes = WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_CM | WIN_ENABLE; - ipw->request_common_memory.Base = + request_common_memory.Base = parse.cftable_entry.mem.win[0].host_addr; - ipw->request_common_memory.Size = parse.cftable_entry.mem.win[0].len; - if (ipw->request_common_memory.Size < 0x1000) - ipw->request_common_memory.Size = 0x1000; - ipw->request_common_memory.AccessSpeed = 0; + request_common_memory.Size = parse.cftable_entry.mem.win[0].len; + if (request_common_memory.Size < 0x1000) + request_common_memory.Size = 0x1000; + request_common_memory.AccessSpeed = 0; - ret = pcmcia_request_window(&link, &ipw->request_common_memory, + ret = pcmcia_request_window(&link, &request_common_memory, &ipw->handle_common_memory); if (ret != CS_SUCCESS) { @@ -247,18 +246,16 @@ static int config_ipwireless(struct ipw_dev *ipw) ipw->is_v2_card = parse.cftable_entry.mem.win[0].len == 0x100; - ipw->common_memory = ioremap(ipw->request_common_memory.Base, - ipw->request_common_memory.Size); - request_mem_region(ipw->request_common_memory.Base, - ipw->request_common_memory.Size, IPWIRELESS_PCCARD_NAME); + ipw->common_memory = ioremap(request_common_memory.Base, + request_common_memory.Size); - ipw->request_attr_memory.Attributes = + request_attr_memory.Attributes = WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_AM | WIN_ENABLE; - ipw->request_attr_memory.Base = 0; - ipw->request_attr_memory.Size = 0; /* this used to be 0x1000 */ - ipw->request_attr_memory.AccessSpeed = 0; + request_attr_memory.Base = 0; + request_attr_memory.Size = 0; /* this used to be 0x1000 */ + request_attr_memory.AccessSpeed = 0; - ret = pcmcia_request_window(&link, &ipw->request_attr_memory, + ret = pcmcia_request_window(&link, &request_attr_memory, &ipw->handle_attr_memory); if (ret != CS_SUCCESS) { @@ -277,10 +274,8 @@ static int config_ipwireless(struct ipw_dev *ipw) goto exit2; } - ipw->attr_memory = ioremap(ipw->request_attr_memory.Base, - ipw->request_attr_memory.Size); - request_mem_region(ipw->request_attr_memory.Base, ipw->request_attr_memory.Size, - IPWIRELESS_PCCARD_NAME); + ipw->attr_memory = ioremap(request_attr_memory.Base, + request_attr_memory.Size); } INIT_WORK(&ipw->work_reboot, signalled_reboot_work); @@ -316,13 +311,14 @@ static int config_ipwireless(struct ipw_dev *ipw) (unsigned int) link->irq.AssignedIRQ); if (ipw->attr_memory && ipw->common_memory) printk(KERN_INFO IPWIRELESS_PCCARD_NAME - ": attr memory 0x%08lx-0x%08lx, common memory 0x%08lx-0x%08lx\n", - ipw->request_attr_memory.Base, - ipw->request_attr_memory.Base - + ipw->request_attr_memory.Size - 1, - ipw->request_common_memory.Base, - ipw->request_common_memory.Base - + ipw->request_common_memory.Size - 1); + ": attr memory 0x%08lx-0x%08lx, " + "common memory 0x%08lx-0x%08lx\n", + request_attr_memory.Base, + request_attr_memory.Base + + request_attr_memory.Size - 1, + request_common_memory.Base, + request_common_memory.Base + + request_common_memory.Size - 1); ipw->network = ipwireless_network_create(ipw->hardware); if (!ipw->network) @@ -354,16 +350,12 @@ static int config_ipwireless(struct ipw_dev *ipw) pcmcia_disable_device(link); exit3: if (ipw->attr_memory) { - release_mem_region(ipw->request_attr_memory.Base, - ipw->request_attr_memory.Size); iounmap(ipw->attr_memory); pcmcia_release_window(ipw->handle_attr_memory); pcmcia_disable_device(link); } exit2: if (ipw->common_memory) { - release_mem_region(ipw->request_common_memory.Base, - ipw->request_common_memory.Size); iounmap(ipw->common_memory); pcmcia_release_window(ipw->handle_common_memory); } @@ -375,25 +367,19 @@ static int config_ipwireless(struct ipw_dev *ipw) static void release_ipwireless(struct ipw_dev *ipw) { - pcmcia_disable_device(ipw->link); + struct pcmcia_device *link = ipw->link; - if (ipw->common_memory) { - release_mem_region(ipw->request_common_memory.Base, - ipw->request_common_memory.Size); + pcmcia_disable_device(link); + + if (ipw->common_memory) iounmap(ipw->common_memory); - } - if (ipw->attr_memory) { - release_mem_region(ipw->request_attr_memory.Base, - ipw->request_attr_memory.Size); + if (ipw->attr_memory) iounmap(ipw->attr_memory); - } if (ipw->common_memory) pcmcia_release_window(ipw->handle_common_memory); if (ipw->attr_memory) pcmcia_release_window(ipw->handle_attr_memory); - - /* Break the link with Card Services */ - pcmcia_disable_device(ipw->link); + pcmcia_disable_device(link); } /* @@ -451,6 +437,10 @@ static void ipwireless_detach(struct pcmcia_device *link) release_ipwireless(ipw); + /* Break the link with Card Services */ + if (link) + pcmcia_disable_device(link); + if (ipw->tty != NULL) ipwireless_tty_free(ipw->tty); if (ipw->network != NULL) diff --git a/trunk/drivers/char/pcmcia/ipwireless/main.h b/trunk/drivers/char/pcmcia/ipwireless/main.h index 0e0363af9ab2..1bfdcc8d47d6 100644 --- a/trunk/drivers/char/pcmcia/ipwireless/main.h +++ b/trunk/drivers/char/pcmcia/ipwireless/main.h @@ -45,15 +45,10 @@ struct ipw_tty; struct ipw_dev { struct pcmcia_device *link; int is_v2_card; - window_handle_t handle_attr_memory; void __iomem *attr_memory; - win_req_t request_attr_memory; - window_handle_t handle_common_memory; void __iomem *common_memory; - win_req_t request_common_memory; - dev_node_t nodes[2]; /* Reference to attribute memory, containing CIS data */ void *attribute_memory; diff --git a/trunk/drivers/char/pcmcia/ipwireless/network.c b/trunk/drivers/char/pcmcia/ipwireless/network.c index 590762a7f217..fe914d34f7f6 100644 --- a/trunk/drivers/char/pcmcia/ipwireless/network.c +++ b/trunk/drivers/char/pcmcia/ipwireless/network.c @@ -29,6 +29,7 @@ #include "main.h" #include "tty.h" +#define MAX_OUTGOING_PACKETS_QUEUED ipwireless_out_queue #define MAX_ASSOCIATED_TTYS 2 #define SC_RCV_BITS (SC_RCV_B7_1|SC_RCV_B7_0|SC_RCV_ODDP|SC_RCV_EVNP) @@ -45,7 +46,7 @@ struct ipw_network { /* Number of packets queued up in hardware module. */ int outgoing_packets_queued; /* Spinlock to avoid interrupts during shutdown */ - spinlock_t lock; + spinlock_t spinlock; struct mutex close_lock; /* PPP ioctl data, not actually used anywere */ @@ -67,20 +68,20 @@ static void notify_packet_sent(void *callback_data, unsigned int packet_length) struct ipw_network *network = callback_data; unsigned long flags; - spin_lock_irqsave(&network->lock, flags); + spin_lock_irqsave(&network->spinlock, flags); network->outgoing_packets_queued--; if (network->ppp_channel != NULL) { if (network->ppp_blocked) { network->ppp_blocked = 0; - spin_unlock_irqrestore(&network->lock, flags); + spin_unlock_irqrestore(&network->spinlock, flags); ppp_output_wakeup(network->ppp_channel); if (ipwireless_debug) - printk(KERN_DEBUG IPWIRELESS_PCCARD_NAME + printk(KERN_INFO IPWIRELESS_PCCARD_NAME ": ppp unblocked\n"); } else - spin_unlock_irqrestore(&network->lock, flags); + spin_unlock_irqrestore(&network->spinlock, flags); } else - spin_unlock_irqrestore(&network->lock, flags); + spin_unlock_irqrestore(&network->spinlock, flags); } /* @@ -92,8 +93,8 @@ static int ipwireless_ppp_start_xmit(struct ppp_channel *ppp_channel, struct ipw_network *network = ppp_channel->private; unsigned long flags; - spin_lock_irqsave(&network->lock, flags); - if (network->outgoing_packets_queued < ipwireless_out_queue) { + spin_lock_irqsave(&network->spinlock, flags); + if (network->outgoing_packets_queued < MAX_OUTGOING_PACKETS_QUEUED) { unsigned char *buf; static unsigned char header[] = { PPP_ALLSTATIONS, /* 0xff */ @@ -102,7 +103,7 @@ static int ipwireless_ppp_start_xmit(struct ppp_channel *ppp_channel, int ret; network->outgoing_packets_queued++; - spin_unlock_irqrestore(&network->lock, flags); + spin_unlock_irqrestore(&network->spinlock, flags); /* * If we have the requested amount of headroom in the skb we @@ -143,9 +144,7 @@ static int ipwireless_ppp_start_xmit(struct ppp_channel *ppp_channel, * needs to be unblocked once we are ready to send. */ network->ppp_blocked = 1; - spin_unlock_irqrestore(&network->lock, flags); - if (ipwireless_debug) - printk(KERN_DEBUG IPWIRELESS_PCCARD_NAME ": ppp blocked\n"); + spin_unlock_irqrestore(&network->spinlock, flags); return 0; } } @@ -250,11 +249,11 @@ static void do_go_online(struct work_struct *work_go_online) work_go_online); unsigned long flags; - spin_lock_irqsave(&network->lock, flags); + spin_lock_irqsave(&network->spinlock, flags); if (!network->ppp_channel) { struct ppp_channel *channel; - spin_unlock_irqrestore(&network->lock, flags); + spin_unlock_irqrestore(&network->spinlock, flags); channel = kzalloc(sizeof(struct ppp_channel), GFP_KERNEL); if (!channel) { printk(KERN_ERR IPWIRELESS_PCCARD_NAME @@ -274,10 +273,10 @@ static void do_go_online(struct work_struct *work_go_online) network->xaccm[3] = 0x60000000U; network->raccm = ~0U; ppp_register_channel(channel); - spin_lock_irqsave(&network->lock, flags); + spin_lock_irqsave(&network->spinlock, flags); network->ppp_channel = channel; } - spin_unlock_irqrestore(&network->lock, flags); + spin_unlock_irqrestore(&network->spinlock, flags); } static void do_go_offline(struct work_struct *work_go_offline) @@ -288,16 +287,16 @@ static void do_go_offline(struct work_struct *work_go_offline) unsigned long flags; mutex_lock(&network->close_lock); - spin_lock_irqsave(&network->lock, flags); + spin_lock_irqsave(&network->spinlock, flags); if (network->ppp_channel != NULL) { struct ppp_channel *channel = network->ppp_channel; network->ppp_channel = NULL; - spin_unlock_irqrestore(&network->lock, flags); + spin_unlock_irqrestore(&network->spinlock, flags); mutex_unlock(&network->close_lock); ppp_unregister_channel(channel); } else { - spin_unlock_irqrestore(&network->lock, flags); + spin_unlock_irqrestore(&network->spinlock, flags); mutex_unlock(&network->close_lock); } } @@ -382,18 +381,18 @@ void ipwireless_network_packet_received(struct ipw_network *network, * the PPP layer. */ mutex_lock(&network->close_lock); - spin_lock_irqsave(&network->lock, flags); + spin_lock_irqsave(&network->spinlock, flags); if (network->ppp_channel != NULL) { struct sk_buff *skb; - spin_unlock_irqrestore(&network->lock, + spin_unlock_irqrestore(&network->spinlock, flags); /* Send the data to the ppp_generic module. */ skb = ipw_packet_received_skb(data, length); ppp_input(network->ppp_channel, skb); } else - spin_unlock_irqrestore(&network->lock, + spin_unlock_irqrestore(&network->spinlock, flags); mutex_unlock(&network->close_lock); } @@ -411,7 +410,7 @@ struct ipw_network *ipwireless_network_create(struct ipw_hardware *hw) if (!network) return NULL; - spin_lock_init(&network->lock); + spin_lock_init(&network->spinlock); mutex_init(&network->close_lock); network->hardware = hw; @@ -479,10 +478,10 @@ int ipwireless_ppp_channel_index(struct ipw_network *network) int ret = -1; unsigned long flags; - spin_lock_irqsave(&network->lock, flags); + spin_lock_irqsave(&network->spinlock, flags); if (network->ppp_channel != NULL) ret = ppp_channel_index(network->ppp_channel); - spin_unlock_irqrestore(&network->lock, flags); + spin_unlock_irqrestore(&network->spinlock, flags); return ret; } @@ -492,15 +491,10 @@ int ipwireless_ppp_unit_number(struct ipw_network *network) int ret = -1; unsigned long flags; - spin_lock_irqsave(&network->lock, flags); + spin_lock_irqsave(&network->spinlock, flags); if (network->ppp_channel != NULL) ret = ppp_unit_number(network->ppp_channel); - spin_unlock_irqrestore(&network->lock, flags); + spin_unlock_irqrestore(&network->spinlock, flags); return ret; } - -int ipwireless_ppp_mru(const struct ipw_network *network) -{ - return network->mru; -} diff --git a/trunk/drivers/char/pcmcia/ipwireless/network.h b/trunk/drivers/char/pcmcia/ipwireless/network.h index 561f765b3334..ccacd26fc7ef 100644 --- a/trunk/drivers/char/pcmcia/ipwireless/network.h +++ b/trunk/drivers/char/pcmcia/ipwireless/network.h @@ -48,6 +48,5 @@ void ipwireless_ppp_open(struct ipw_network *net); void ipwireless_ppp_close(struct ipw_network *net); int ipwireless_ppp_channel_index(struct ipw_network *net); int ipwireless_ppp_unit_number(struct ipw_network *net); -int ipwireless_ppp_mru(const struct ipw_network *net); #endif diff --git a/trunk/drivers/char/pcmcia/ipwireless/tty.c b/trunk/drivers/char/pcmcia/ipwireless/tty.c index b1414507997c..42f3815c5ce3 100644 --- a/trunk/drivers/char/pcmcia/ipwireless/tty.c +++ b/trunk/drivers/char/pcmcia/ipwireless/tty.c @@ -259,7 +259,7 @@ static int ipw_write(struct tty_struct *linux_tty, } ret = ipwireless_send_packet(tty->hardware, IPW_CHANNEL_RAS, - buf, count, + (unsigned char *) buf, count, ipw_write_packet_sent_callback, tty); if (ret == -1) { mutex_unlock(&tty->ipw_tty_mutex); diff --git a/trunk/drivers/cpuidle/cpuidle.c b/trunk/drivers/cpuidle/cpuidle.c index 5ce07b517c58..5405769020a1 100644 --- a/trunk/drivers/cpuidle/cpuidle.c +++ b/trunk/drivers/cpuidle/cpuidle.c @@ -94,7 +94,7 @@ void cpuidle_install_idle_handler(void) */ void cpuidle_uninstall_idle_handler(void) { - if (enabled_devices && pm_idle_old && (pm_idle != pm_idle_old)) { + if (enabled_devices && (pm_idle != pm_idle_old)) { pm_idle = pm_idle_old; cpuidle_kick_cpus(); } diff --git a/trunk/drivers/i2c/busses/i2c-bfin-twi.c b/trunk/drivers/i2c/busses/i2c-bfin-twi.c index 3c855ff2992f..48d084bdf7c8 100644 --- a/trunk/drivers/i2c/busses/i2c-bfin-twi.c +++ b/trunk/drivers/i2c/busses/i2c-bfin-twi.c @@ -49,8 +49,6 @@ struct bfin_twi_iface { struct i2c_msg *pmsg; int msg_num; int cur_msg; - u16 saved_clkdiv; - u16 saved_control; void __iomem *regs_base; }; @@ -567,43 +565,32 @@ static u32 bfin_twi_functionality(struct i2c_adapter *adap) I2C_FUNC_I2C; } + static struct i2c_algorithm bfin_twi_algorithm = { .master_xfer = bfin_twi_master_xfer, .smbus_xfer = bfin_twi_smbus_xfer, .functionality = bfin_twi_functionality, }; -static int i2c_bfin_twi_suspend(struct platform_device *pdev, pm_message_t state) -{ - struct bfin_twi_iface *iface = platform_get_drvdata(pdev); - iface->saved_clkdiv = read_CLKDIV(iface); - iface->saved_control = read_CONTROL(iface); - - free_irq(iface->irq, iface); +static int i2c_bfin_twi_suspend(struct platform_device *dev, pm_message_t state) +{ + struct bfin_twi_iface *iface = platform_get_drvdata(dev); /* Disable TWI */ - write_CONTROL(iface, iface->saved_control & ~TWI_ENA); + write_CONTROL(iface, read_CONTROL(iface) & ~TWI_ENA); + SSYNC(); return 0; } -static int i2c_bfin_twi_resume(struct platform_device *pdev) +static int i2c_bfin_twi_resume(struct platform_device *dev) { - struct bfin_twi_iface *iface = platform_get_drvdata(pdev); + struct bfin_twi_iface *iface = platform_get_drvdata(dev); - int rc = request_irq(iface->irq, bfin_twi_interrupt_entry, - IRQF_DISABLED, pdev->name, iface); - if (rc) { - dev_err(&pdev->dev, "Can't get IRQ %d !\n", iface->irq); - return -ENODEV; - } - - /* Resume TWI interface clock as specified */ - write_CLKDIV(iface, iface->saved_clkdiv); - - /* Resume TWI */ - write_CONTROL(iface, iface->saved_control); + /* Enable TWI */ + write_CONTROL(iface, read_CONTROL(iface) | TWI_ENA); + SSYNC(); return 0; } diff --git a/trunk/drivers/i2c/busses/i2c-gpio.c b/trunk/drivers/i2c/busses/i2c-gpio.c index 32104eac8d3d..79b455a1f090 100644 --- a/trunk/drivers/i2c/busses/i2c-gpio.c +++ b/trunk/drivers/i2c/busses/i2c-gpio.c @@ -77,7 +77,7 @@ static int i2c_gpio_getscl(void *data) return gpio_get_value(pdata->scl_pin); } -static int __devinit i2c_gpio_probe(struct platform_device *pdev) +static int __init i2c_gpio_probe(struct platform_device *pdev) { struct i2c_gpio_platform_data *pdata; struct i2c_algo_bit_data *bit_data; @@ -174,7 +174,7 @@ static int __devinit i2c_gpio_probe(struct platform_device *pdev) return ret; } -static int __devexit i2c_gpio_remove(struct platform_device *pdev) +static int __exit i2c_gpio_remove(struct platform_device *pdev) { struct i2c_gpio_platform_data *pdata; struct i2c_adapter *adap; @@ -196,15 +196,14 @@ static struct platform_driver i2c_gpio_driver = { .name = "i2c-gpio", .owner = THIS_MODULE, }, - .probe = i2c_gpio_probe, - .remove = __devexit_p(i2c_gpio_remove), + .remove = __exit_p(i2c_gpio_remove), }; static int __init i2c_gpio_init(void) { int ret; - ret = platform_driver_register(&i2c_gpio_driver); + ret = platform_driver_probe(&i2c_gpio_driver, i2c_gpio_probe); if (ret) printk(KERN_ERR "i2c-gpio: probe failed: %d\n", ret); diff --git a/trunk/drivers/i2c/busses/i2c-s3c2410.c b/trunk/drivers/i2c/busses/i2c-s3c2410.c index 4864723c7425..007390ad9810 100644 --- a/trunk/drivers/i2c/busses/i2c-s3c2410.c +++ b/trunk/drivers/i2c/busses/i2c-s3c2410.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -65,7 +64,6 @@ struct s3c24xx_i2c { unsigned int tx_setup; enum s3c24xx_i2c_state state; - unsigned long clkrate; void __iomem *regs; struct clk *clk; @@ -73,10 +71,6 @@ struct s3c24xx_i2c { struct resource *irq; struct resource *ioarea; struct i2c_adapter adap; - -#ifdef CONFIG_CPU_FREQ - struct notifier_block freq_transition; -#endif }; /* default platform data to use if not supplied in the platform_device @@ -507,9 +501,6 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg *msgs, int unsigned long timeout; int ret; - if (!readl(i2c->regs + S3C2410_IICCON) & S3C2410_IICCON_IRQEN) - return -EIO; - ret = s3c24xx_i2c_set_master(i2c); if (ret != 0) { dev_err(i2c->dev, "cannot get bus (error %d)\n", ret); @@ -645,28 +636,27 @@ static inline int freq_acceptable(unsigned int freq, unsigned int wanted) return (diff >= -2 && diff <= 2); } -/* s3c24xx_i2c_clockrate +/* s3c24xx_i2c_getdivisor * * work out a divisor for the user requested frequency setting, * either by the requested frequency, or scanning the acceptable * range of frequencies until something is found */ -static int s3c24xx_i2c_clockrate(struct s3c24xx_i2c *i2c, unsigned int *got) +static int s3c24xx_i2c_getdivisor(struct s3c24xx_i2c *i2c, + struct s3c2410_platform_i2c *pdata, + unsigned long *iicon, + unsigned int *got) { - struct s3c2410_platform_i2c *pdata; unsigned long clkin = clk_get_rate(i2c->clk); + unsigned int divs, div1; - u32 iiccon; int freq; int start, end; - i2c->clkrate = clkin; - - pdata = s3c24xx_i2c_get_platformdata(i2c->adap.dev.parent); clkin /= 1000; /* clkin now in KHz */ - dev_dbg(i2c->dev, "pdata %p, freq %lu %lu..%lu\n", + dev_dbg(i2c->dev, "pdata %p, freq %lu %lu..%lu\n", pdata, pdata->bus_freq, pdata->min_freq, pdata->max_freq); if (pdata->bus_freq != 0) { @@ -698,79 +688,11 @@ static int s3c24xx_i2c_clockrate(struct s3c24xx_i2c *i2c, unsigned int *got) found: *got = freq; - - iiccon = readl(i2c->regs + S3C2410_IICCON); - iiccon &= ~(S3C2410_IICCON_SCALEMASK | S3C2410_IICCON_TXDIV_512); - iiccon |= (divs-1); - - if (div1 == 512) - iiccon |= S3C2410_IICCON_TXDIV_512; - - writel(iiccon, i2c->regs + S3C2410_IICCON); - - return 0; -} - -#ifdef CONFIG_CPU_FREQ - -#define freq_to_i2c(_n) container_of(_n, struct s3c24xx_i2c, freq_transition) - -static int s3c24xx_i2c_cpufreq_transition(struct notifier_block *nb, - unsigned long val, void *data) -{ - struct s3c24xx_i2c *i2c = freq_to_i2c(nb); - unsigned long flags; - unsigned int got; - int delta_f; - int ret; - - delta_f = clk_get_rate(i2c->clk) - i2c->clkrate; - - /* if we're post-change and the input clock has slowed down - * or at pre-change and the clock is about to speed up, then - * adjust our clock rate. <0 is slow, >0 speedup. - */ - - if ((val == CPUFREQ_POSTCHANGE && delta_f < 0) || - (val == CPUFREQ_PRECHANGE && delta_f > 0)) { - spin_lock_irqsave(&i2c->lock, flags); - ret = s3c24xx_i2c_clockrate(i2c, &got); - spin_unlock_irqrestore(&i2c->lock, flags); - - if (ret < 0) - dev_err(i2c->dev, "cannot find frequency\n"); - else - dev_info(i2c->dev, "setting freq %d\n", got); - } - - return 0; -} - -static inline int s3c24xx_i2c_register_cpufreq(struct s3c24xx_i2c *i2c) -{ - i2c->freq_transition.notifier_call = s3c24xx_i2c_cpufreq_transition; - - return cpufreq_register_notifier(&i2c->freq_transition, - CPUFREQ_TRANSITION_NOTIFIER); -} - -static inline void s3c24xx_i2c_deregister_cpufreq(struct s3c24xx_i2c *i2c) -{ - cpufreq_unregister_notifier(&i2c->freq_transition, - CPUFREQ_TRANSITION_NOTIFIER); -} - -#else -static inline int s3c24xx_i2c_register_cpufreq(struct s3c24xx_i2c *i2c) -{ + *iicon |= (divs-1); + *iicon |= (div1 == 512) ? S3C2410_IICCON_TXDIV_512 : 0; return 0; } -static inline void s3c24xx_i2c_deregister_cpufreq(struct s3c24xx_i2c *i2c) -{ -} -#endif - /* s3c24xx_i2c_init * * initialise the controller, set the IO lines and frequency @@ -797,12 +719,9 @@ static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c) dev_info(i2c->dev, "slave address 0x%02x\n", pdata->slave_addr); - writel(iicon, i2c->regs + S3C2410_IICCON); - /* we need to work out the divisors for the clock... */ - if (s3c24xx_i2c_clockrate(i2c, &freq) != 0) { - writel(0, i2c->regs + S3C2410_IICCON); + if (s3c24xx_i2c_getdivisor(i2c, pdata, &iicon, &freq) != 0) { dev_err(i2c->dev, "cannot meet bus frequency required\n"); return -EINVAL; } @@ -811,6 +730,8 @@ static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c) dev_info(i2c->dev, "bus frequency set to %d KHz\n", freq); dev_dbg(i2c->dev, "S3C2410_IICCON=0x%02lx\n", iicon); + + writel(iicon, i2c->regs + S3C2410_IICCON); /* check for s3c2440 i2c controller */ @@ -831,12 +752,9 @@ static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c) static int s3c24xx_i2c_probe(struct platform_device *pdev) { struct s3c24xx_i2c *i2c = &s3c24xx_i2c; - struct s3c2410_platform_i2c *pdata; struct resource *res; int ret; - pdata = s3c24xx_i2c_get_platformdata(&pdev->dev); - /* find the clock and enable it */ i2c->dev = &pdev->dev; @@ -914,24 +832,10 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) dev_dbg(&pdev->dev, "irq resource %p (%lu)\n", res, (unsigned long)res->start); - ret = s3c24xx_i2c_register_cpufreq(i2c); - if (ret < 0) { - dev_err(&pdev->dev, "failed to register cpufreq notifier\n"); - goto err_irq; - } - - /* Note, previous versions of the driver used i2c_add_adapter() - * to add the bus at any number. We now pass the bus number via - * the platform data, so if unset it will now default to always - * being bus 0. - */ - - i2c->adap.nr = pdata->bus_num; - - ret = i2c_add_numbered_adapter(&i2c->adap); + ret = i2c_add_adapter(&i2c->adap); if (ret < 0) { dev_err(&pdev->dev, "failed to add bus to i2c core\n"); - goto err_cpufreq; + goto err_irq; } platform_set_drvdata(pdev, i2c); @@ -939,9 +843,6 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) dev_info(&pdev->dev, "%s: S3C I2C adapter\n", i2c->adap.dev.bus_id); return 0; - err_cpufreq: - s3c24xx_i2c_deregister_cpufreq(i2c); - err_irq: free_irq(i2c->irq->start, i2c); @@ -969,8 +870,6 @@ static int s3c24xx_i2c_remove(struct platform_device *pdev) { struct s3c24xx_i2c *i2c = platform_get_drvdata(pdev); - s3c24xx_i2c_deregister_cpufreq(i2c); - i2c_del_adapter(&i2c->adap); free_irq(i2c->irq->start, i2c); diff --git a/trunk/drivers/input/touchscreen/corgi_ts.c b/trunk/drivers/input/touchscreen/corgi_ts.c index d0e13fc4a88c..4e9d8eece2e0 100644 --- a/trunk/drivers/input/touchscreen/corgi_ts.c +++ b/trunk/drivers/input/touchscreen/corgi_ts.c @@ -195,7 +195,7 @@ static void ts_interrupt_main(struct corgi_ts *corgi_ts, int isTimer) { if ((GPLR(IRQ_TO_GPIO(corgi_ts->irq_gpio)) & GPIO_bit(IRQ_TO_GPIO(corgi_ts->irq_gpio))) == 0) { /* Disable Interrupt */ - set_irq_type(corgi_ts->irq_gpio, IRQ_TYPE_NONE); + set_irq_type(corgi_ts->irq_gpio, IRQT_NOEDGE); if (read_xydata(corgi_ts)) { corgi_ts->pendown = 1; new_data(corgi_ts); @@ -214,7 +214,7 @@ static void ts_interrupt_main(struct corgi_ts *corgi_ts, int isTimer) } /* Enable Falling Edge */ - set_irq_type(corgi_ts->irq_gpio, IRQ_TYPE_EDGE_FALLING); + set_irq_type(corgi_ts->irq_gpio, IRQT_FALLING); corgi_ts->pendown = 0; } } @@ -258,7 +258,7 @@ static int corgits_resume(struct platform_device *dev) corgi_ssp_ads7846_putget((4u << ADSCTRL_ADR_SH) | ADSCTRL_STS); /* Enable Falling Edge */ - set_irq_type(corgi_ts->irq_gpio, IRQ_TYPE_EDGE_FALLING); + set_irq_type(corgi_ts->irq_gpio, IRQT_FALLING); corgi_ts->power_mode = PWR_MODE_ACTIVE; return 0; @@ -333,7 +333,7 @@ static int __init corgits_probe(struct platform_device *pdev) corgi_ts->power_mode = PWR_MODE_ACTIVE; /* Enable Falling Edge */ - set_irq_type(corgi_ts->irq_gpio, IRQ_TYPE_EDGE_FALLING); + set_irq_type(corgi_ts->irq_gpio, IRQT_FALLING); return 0; diff --git a/trunk/drivers/input/touchscreen/mainstone-wm97xx.c b/trunk/drivers/input/touchscreen/mainstone-wm97xx.c index 590a1379aa32..a79f029b91c0 100644 --- a/trunk/drivers/input/touchscreen/mainstone-wm97xx.c +++ b/trunk/drivers/input/touchscreen/mainstone-wm97xx.c @@ -198,7 +198,7 @@ static int wm97xx_acc_startup(struct wm97xx *wm) switch (wm->id) { case WM9705_ID2: wm->pen_irq = IRQ_GPIO(4); - set_irq_type(IRQ_GPIO(4), IRQ_TYPE_EDGE_BOTH); + set_irq_type(IRQ_GPIO(4), IRQT_BOTHEDGE); break; case WM9712_ID2: case WM9713_ID2: diff --git a/trunk/drivers/mfd/asic3.c b/trunk/drivers/mfd/asic3.c index c6408a62d95e..eabf0bfccab4 100644 --- a/trunk/drivers/mfd/asic3.c +++ b/trunk/drivers/mfd/asic3.c @@ -256,28 +256,28 @@ static int asic3_gpio_irq_type(unsigned int irq, unsigned int type) bank + ASIC3_GPIO_TRIGGER_TYPE); asic->irq_bothedge[(irq - asic->irq_base) >> 4] &= ~bit; - if (type == IRQ_TYPE_EDGE_RISING) { + if (type == IRQT_RISING) { trigger |= bit; edge |= bit; - } else if (type == IRQ_TYPE_EDGE_FALLING) { + } else if (type == IRQT_FALLING) { trigger |= bit; edge &= ~bit; - } else if (type == IRQ_TYPE_EDGE_BOTH) { + } else if (type == IRQT_BOTHEDGE) { trigger |= bit; if (asic3_gpio_get(&asic->gpio, irq - asic->irq_base)) edge &= ~bit; else edge |= bit; asic->irq_bothedge[(irq - asic->irq_base) >> 4] |= bit; - } else if (type == IRQ_TYPE_LEVEL_LOW) { + } else if (type == IRQT_LOW) { trigger &= ~bit; level &= ~bit; - } else if (type == IRQ_TYPE_LEVEL_HIGH) { + } else if (type == IRQT_HIGH) { trigger &= ~bit; level |= bit; } else { /* - * if type == IRQ_TYPE_NONE, we should mask interrupts, but + * if type == IRQT_NOEDGE, we should mask interrupts, but * be careful to not unmask them if mask was also called. * Probably need internal state for mask. */ @@ -343,7 +343,7 @@ static int __init asic3_irq_probe(struct platform_device *pdev) ASIC3_INTMASK_GINTMASK); set_irq_chained_handler(asic->irq_nr, asic3_irq_demux); - set_irq_type(asic->irq_nr, IRQ_TYPE_EDGE_RISING); + set_irq_type(asic->irq_nr, IRQT_RISING); set_irq_data(asic->irq_nr, asic); return 0; diff --git a/trunk/drivers/mfd/tc6393xb.c b/trunk/drivers/mfd/tc6393xb.c index 94e55e8e7ce6..2d87501b6fd4 100644 --- a/trunk/drivers/mfd/tc6393xb.c +++ b/trunk/drivers/mfd/tc6393xb.c @@ -324,7 +324,7 @@ static void tc6393xb_attach_irq(struct platform_device *dev) set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); } - set_irq_type(tc6393xb->irq, IRQ_TYPE_EDGE_FALLING); + set_irq_type(tc6393xb->irq, IRQT_FALLING); set_irq_data(tc6393xb->irq, tc6393xb); set_irq_chained_handler(tc6393xb->irq, tc6393xb_irq); } diff --git a/trunk/drivers/pcmcia/soc_common.c b/trunk/drivers/pcmcia/soc_common.c index 8c21446996f2..420a77540f41 100644 --- a/trunk/drivers/pcmcia/soc_common.c +++ b/trunk/drivers/pcmcia/soc_common.c @@ -149,10 +149,10 @@ soc_common_pcmcia_config_skt(struct soc_pcmcia_socket *skt, socket_state_t *stat */ if (skt->irq_state != 1 && state->io_irq) { skt->irq_state = 1; - set_irq_type(skt->irq, IRQ_TYPE_EDGE_FALLING); + set_irq_type(skt->irq, IRQT_FALLING); } else if (skt->irq_state == 1 && state->io_irq == 0) { skt->irq_state = 0; - set_irq_type(skt->irq, IRQ_TYPE_NONE); + set_irq_type(skt->irq, IRQT_NOEDGE); } skt->cs_state = *state; @@ -527,7 +527,7 @@ int soc_pcmcia_request_irqs(struct soc_pcmcia_socket *skt, IRQF_DISABLED, irqs[i].str, skt); if (res) break; - set_irq_type(irqs[i].irq, IRQ_TYPE_NONE); + set_irq_type(irqs[i].irq, IRQT_NOEDGE); } if (res) { @@ -560,7 +560,7 @@ void soc_pcmcia_disable_irqs(struct soc_pcmcia_socket *skt, for (i = 0; i < nr; i++) if (irqs[i].sock == skt->nr) - set_irq_type(irqs[i].irq, IRQ_TYPE_NONE); + set_irq_type(irqs[i].irq, IRQT_NOEDGE); } EXPORT_SYMBOL(soc_pcmcia_disable_irqs); @@ -571,8 +571,8 @@ void soc_pcmcia_enable_irqs(struct soc_pcmcia_socket *skt, for (i = 0; i < nr; i++) if (irqs[i].sock == skt->nr) { - set_irq_type(irqs[i].irq, IRQ_TYPE_EDGE_RISING); - set_irq_type(irqs[i].irq, IRQ_TYPE_EDGE_BOTH); + set_irq_type(irqs[i].irq, IRQT_RISING); + set_irq_type(irqs[i].irq, IRQT_BOTHEDGE); } } EXPORT_SYMBOL(soc_pcmcia_enable_irqs); diff --git a/trunk/drivers/video/am200epd.c b/trunk/drivers/video/am200epd.c index 32dd85126931..51e26c1f5e8b 100644 --- a/trunk/drivers/video/am200epd.c +++ b/trunk/drivers/video/am200epd.c @@ -221,7 +221,7 @@ static int am200_setup_irq(struct fb_info *info) return retval; } - return set_irq_type(IRQ_GPIO(RDY_GPIO_PIN), IRQ_TYPE_EDGE_FALLING); + return set_irq_type(IRQ_GPIO(RDY_GPIO_PIN), IRQT_FALLING); } static void am200_set_rst(struct metronomefb_par *par, int state) diff --git a/trunk/drivers/video/omap/sossi.c b/trunk/drivers/video/omap/sossi.c index fafd0f26b90f..81dbcf53cf0e 100644 --- a/trunk/drivers/video/omap/sossi.c +++ b/trunk/drivers/video/omap/sossi.c @@ -646,7 +646,7 @@ static int sossi_init(struct omapfb_device *fbdev) sossi_write_reg(SOSSI_INIT1_REG, l); if ((r = request_irq(INT_1610_SoSSI_MATCH, sossi_match_irq, - IRQ_TYPE_EDGE_FALLING, + IRQT_FALLING, "sossi_match", sossi.fbdev->dev)) < 0) { dev_err(sossi.fbdev->dev, "can't get SoSSI match IRQ\n"); goto err; diff --git a/trunk/drivers/video/pxafb.c b/trunk/drivers/video/pxafb.c index 69de2fed6c58..2b707a8ce5de 100644 --- a/trunk/drivers/video/pxafb.c +++ b/trunk/drivers/video/pxafb.c @@ -1336,7 +1336,7 @@ static int __devinit pxafb_map_video_memory(struct pxafb_info *fbi) fbi->dma_buff_phys = fbi->map_dma; fbi->palette_cpu = (u16 *) fbi->dma_buff->palette; - pr_debug("pxafb: palette_mem_size = 0x%08x\n", fbi->palette_size*sizeof(u16)); + pr_debug("pxafb: palette_mem_size = 0x%08lx\n", fbi->palette_size*sizeof(u16)); #ifdef CONFIG_FB_PXA_SMARTPANEL fbi->smart_cmds = (uint16_t *) fbi->dma_buff->cmd_buff; diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c index 9abcd2b329f7..1b94e3650f5c 100644 --- a/trunk/fs/nfs/super.c +++ b/trunk/fs/nfs/super.c @@ -1718,9 +1718,9 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data) * ones were explicitly specified. Fall back to legacy behavior and * just return success. */ - if ((nfsvers == 4 && (!options4 || options4->version == 1)) || - (nfsvers <= 3 && (!options || (options->version >= 1 && - options->version <= 6)))) + if ((nfsvers == 4 && options4->version == 1) || + (nfsvers <= 3 && options->version >= 1 && + options->version <= 6)) return 0; data = kzalloc(sizeof(*data), GFP_KERNEL); diff --git a/trunk/fs/nfs/unlink.c b/trunk/fs/nfs/unlink.c index f089e5839d7d..3adf8b266461 100644 --- a/trunk/fs/nfs/unlink.c +++ b/trunk/fs/nfs/unlink.c @@ -95,11 +95,10 @@ static void nfs_async_unlink_done(struct rpc_task *task, void *calldata) static void nfs_async_unlink_release(void *calldata) { struct nfs_unlinkdata *data = calldata; - struct super_block *sb = data->dir->i_sb; nfs_dec_sillycount(data->dir); + nfs_sb_deactive(NFS_SERVER(data->dir)); nfs_free_unlinkdata(data); - nfs_sb_deactive(NFS_SB(sb)); } static const struct rpc_call_ops nfs_unlink_ops = { diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c index 01ed610f9b87..3d94906c7aa8 100644 --- a/trunk/fs/proc/base.c +++ b/trunk/fs/proc/base.c @@ -2403,7 +2403,7 @@ static int proc_base_fill_cache(struct file *filp, void *dirent, #ifdef CONFIG_TASK_IO_ACCOUNTING static int do_io_accounting(struct task_struct *task, char *buffer, int whole) { - struct task_io_accounting acct = task->ioac; + struct proc_io_accounting acct = task->ioac; unsigned long flags; if (whole && lock_task_sighand(task, &flags)) { @@ -2423,10 +2423,10 @@ static int do_io_accounting(struct task_struct *task, char *buffer, int whole) "read_bytes: %llu\n" "write_bytes: %llu\n" "cancelled_write_bytes: %llu\n", - acct.rchar, acct.wchar, - acct.syscr, acct.syscw, - acct.read_bytes, acct.write_bytes, - acct.cancelled_write_bytes); + acct.chr.rchar, acct.chr.wchar, + acct.chr.syscr, acct.chr.syscw, + acct.blk.read_bytes, acct.blk.write_bytes, + acct.blk.cancelled_write_bytes); } static int proc_tid_io_accounting(struct task_struct *task, char *buffer) diff --git a/trunk/include/asm-arm/arch-pnx4008/irqs.h b/trunk/include/asm-arm/arch-pnx4008/irqs.h index a25d18f2d87a..13ec7ed0f501 100644 --- a/trunk/include/asm-arm/arch-pnx4008/irqs.h +++ b/trunk/include/asm-arm/arch-pnx4008/irqs.h @@ -135,30 +135,30 @@ #define PNX4008_IRQ_TYPES \ { /*IRQ #'s: */ \ -IRQ_TYPE_LEVEL_LOW, IRQ_TYPE_LEVEL_LOW, IRQ_TYPE_LEVEL_LOW, IRQ_TYPE_LEVEL_HIGH, /* 0, 1, 2, 3 */ \ -IRQ_TYPE_LEVEL_LOW, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 4, 5, 6, 7 */ \ -IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 8, 9,10,11 */ \ -IRQ_TYPE_LEVEL_LOW, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 12,13,14,15 */ \ -IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 16,17,18,19 */ \ -IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 20,21,22,23 */ \ -IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 24,25,26,27 */ \ -IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_LOW, IRQ_TYPE_LEVEL_LOW, /* 28,29,30,31 */ \ -IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_LOW, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 32,33,34,35 */ \ -IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_EDGE_FALLING, IRQ_TYPE_LEVEL_HIGH, /* 36,37,38,39 */ \ -IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 40,41,42,43 */ \ -IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 44,45,46,47 */ \ -IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_LOW, IRQ_TYPE_LEVEL_LOW, /* 48,49,50,51 */ \ -IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 52,53,54,55 */ \ -IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_LOW, IRQ_TYPE_LEVEL_HIGH, /* 56,57,58,59 */ \ -IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 60,61,62,63 */ \ -IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 64,65,66,67 */ \ -IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 68,69,70,71 */ \ -IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 72,73,74,75 */ \ -IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 76,77,78,79 */ \ -IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 80,81,82,83 */ \ -IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 84,85,86,87 */ \ -IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 88,89,90,91 */ \ -IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_LEVEL_HIGH, /* 92,93,94,95 */ \ +IRQT_LOW, IRQT_LOW, IRQT_LOW, IRQT_HIGH, /* 0, 1, 2, 3 */ \ +IRQT_LOW, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 4, 5, 6, 7 */ \ +IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 8, 9,10,11 */ \ +IRQT_LOW, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 12,13,14,15 */ \ +IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 16,17,18,19 */ \ +IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 20,21,22,23 */ \ +IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 24,25,26,27 */ \ +IRQT_HIGH, IRQT_HIGH, IRQT_LOW, IRQT_LOW, /* 28,29,30,31 */ \ +IRQT_HIGH, IRQT_LOW, IRQT_HIGH, IRQT_HIGH, /* 32,33,34,35 */ \ +IRQT_HIGH, IRQT_HIGH, IRQT_FALLING, IRQT_HIGH, /* 36,37,38,39 */ \ +IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 40,41,42,43 */ \ +IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 44,45,46,47 */ \ +IRQT_HIGH, IRQT_HIGH, IRQT_LOW, IRQT_LOW, /* 48,49,50,51 */ \ +IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 52,53,54,55 */ \ +IRQT_HIGH, IRQT_HIGH, IRQT_LOW, IRQT_HIGH, /* 56,57,58,59 */ \ +IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 60,61,62,63 */ \ +IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 64,65,66,67 */ \ +IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 68,69,70,71 */ \ +IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 72,73,74,75 */ \ +IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 76,77,78,79 */ \ +IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 80,81,82,83 */ \ +IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 84,85,86,87 */ \ +IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 88,89,90,91 */ \ +IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, IRQT_HIGH, /* 92,93,94,95 */ \ } /* Start Enable Pin Interrupts - table 58 page 66 */ diff --git a/trunk/include/asm-arm/arch-pxa/idp.h b/trunk/include/asm-arm/arch-pxa/idp.h index 21aa8ac35c1c..b6952534a4e1 100644 --- a/trunk/include/asm-arm/arch-pxa/idp.h +++ b/trunk/include/asm-arm/arch-pxa/idp.h @@ -138,18 +138,18 @@ #define TOUCH_PANEL_IRQ IRQ_GPIO(5) #define IDE_IRQ IRQ_GPIO(21) -#define TOUCH_PANEL_IRQ_EDGE IRQ_TYPE_EDGE_FALLING +#define TOUCH_PANEL_IRQ_EDGE IRQT_FALLING #define ETHERNET_IRQ IRQ_GPIO(4) -#define ETHERNET_IRQ_EDGE IRQ_TYPE_EDGE_RISING +#define ETHERNET_IRQ_EDGE IRQT_RISING -#define IDE_IRQ_EDGE IRQ_TYPE_EDGE_RISING +#define IDE_IRQ_EDGE IRQT_RISING #define PCMCIA_S0_CD_VALID IRQ_GPIO(7) -#define PCMCIA_S0_CD_VALID_EDGE IRQ_TYPE_EDGE_BOTH +#define PCMCIA_S0_CD_VALID_EDGE IRQT_BOTHEDGE #define PCMCIA_S1_CD_VALID IRQ_GPIO(8) -#define PCMCIA_S1_CD_VALID_EDGE IRQ_TYPE_EDGE_BOTH +#define PCMCIA_S1_CD_VALID_EDGE IRQT_BOTHEDGE #define PCMCIA_S0_RDYINT IRQ_GPIO(19) #define PCMCIA_S1_RDYINT IRQ_GPIO(22) diff --git a/trunk/include/asm-arm/arch-pxa/pcm990_baseboard.h b/trunk/include/asm-arm/arch-pxa/pcm990_baseboard.h index 2e2013179063..b699d0d7bdb2 100644 --- a/trunk/include/asm-arm/arch-pxa/pcm990_baseboard.h +++ b/trunk/include/asm-arm/arch-pxa/pcm990_baseboard.h @@ -29,14 +29,14 @@ /* CPLD's interrupt controller is connected to PCM-027 GPIO 9 */ #define PCM990_CTRL_INT_IRQ_GPIO 9 #define PCM990_CTRL_INT_IRQ IRQ_GPIO(PCM990_CTRL_INT_IRQ_GPIO) -#define PCM990_CTRL_INT_IRQ_EDGE IRQ_TYPE_EDGE_RISING +#define PCM990_CTRL_INT_IRQ_EDGE IRQT_RISING #define PCM990_CTRL_PHYS PXA_CS1_PHYS /* 16-Bit */ #define PCM990_CTRL_BASE 0xea000000 #define PCM990_CTRL_SIZE (1*1024*1024) #define PCM990_CTRL_PWR_IRQ_GPIO 14 #define PCM990_CTRL_PWR_IRQ IRQ_GPIO(PCM990_CTRL_PWR_IRQ_GPIO) -#define PCM990_CTRL_PWR_IRQ_EDGE IRQ_TYPE_EDGE_RISING +#define PCM990_CTRL_PWR_IRQ_EDGE IRQT_RISING /* visible CPLD (U7) registers */ #define PCM990_CTRL_REG0 0x0000 /* RESET REGISTER */ @@ -133,7 +133,7 @@ */ #define PCM990_IDE_IRQ_GPIO 13 #define PCM990_IDE_IRQ IRQ_GPIO(PCM990_IDE_IRQ_GPIO) -#define PCM990_IDE_IRQ_EDGE IRQ_TYPE_EDGE_RISING +#define PCM990_IDE_IRQ_EDGE IRQT_RISING #define PCM990_IDE_PLD_PHYS 0x20000000 /* 16 bit wide */ #define PCM990_IDE_PLD_BASE 0xee000000 #define PCM990_IDE_PLD_SIZE (1*1024*1024) @@ -189,11 +189,11 @@ */ #define PCM990_CF_IRQ_GPIO 11 #define PCM990_CF_IRQ IRQ_GPIO(PCM990_CF_IRQ_GPIO) -#define PCM990_CF_IRQ_EDGE IRQ_TYPE_EDGE_RISING +#define PCM990_CF_IRQ_EDGE IRQT_RISING #define PCM990_CF_CD_GPIO 12 #define PCM990_CF_CD IRQ_GPIO(PCM990_CF_CD_GPIO) -#define PCM990_CF_CD_EDGE IRQ_TYPE_EDGE_RISING +#define PCM990_CF_CD_EDGE IRQT_RISING #define PCM990_CF_PLD_PHYS 0x30000000 /* 16 bit wide */ #define PCM990_CF_PLD_BASE 0xef000000 @@ -259,14 +259,14 @@ */ #define PCM990_AC97_IRQ_GPIO 10 #define PCM990_AC97_IRQ IRQ_GPIO(PCM990_AC97_IRQ_GPIO) -#define PCM990_AC97_IRQ_EDGE IRQ_TYPE_EDGE_RISING +#define PCM990_AC97_IRQ_EDGE IRQT_RISING /* * MMC phyCORE */ #define PCM990_MMC0_IRQ_GPIO 9 #define PCM990_MMC0_IRQ IRQ_GPIO(PCM990_MMC0_IRQ_GPIO) -#define PCM990_MMC0_IRQ_EDGE IRQ_TYPE_EDGE_FALLING +#define PCM990_MMC0_IRQ_EDGE IRQT_FALLING /* * USB phyCore diff --git a/trunk/include/asm-arm/arch-pxa/pxa25x-udc.h b/trunk/include/asm-arm/arch-pxa/pxa25x-udc.h index 1b80a4805a60..840305916b6d 100644 --- a/trunk/include/asm-arm/arch-pxa/pxa25x-udc.h +++ b/trunk/include/asm-arm/arch-pxa/pxa25x-udc.h @@ -2,7 +2,7 @@ #define _ASM_ARCH_PXA25X_UDC_H #ifdef _ASM_ARCH_PXA27X_UDC_H -#error "You can't include both PXA25x and PXA27x UDC support" +#error You can't include both PXA25x and PXA27x UDC support #endif #define UDC_RES1 __REG(0x40600004) /* UDC Undocumented - Reserved1 */ diff --git a/trunk/include/asm-arm/arch-sa1100/ide.h b/trunk/include/asm-arm/arch-sa1100/ide.h index 193f6c15f4dd..b14cbda01dc3 100644 --- a/trunk/include/asm-arm/arch-sa1100/ide.h +++ b/trunk/include/asm-arm/arch-sa1100/ide.h @@ -61,7 +61,7 @@ ide_init_default_hwifs(void) /* Enable GPIO as interrupt line */ GPDR &= ~LART_GPIO_IDE; - set_irq_type(LART_IRQ_IDE, IRQ_TYPE_EDGE_RISING); + set_irq_type(LART_IRQ_IDE, IRQT_RISING); /* set PCMCIA interface timing */ MECR = 0x00060006; diff --git a/trunk/include/asm-arm/bitops.h b/trunk/include/asm-arm/bitops.h index 9a1db20e032a..5c60bfc1a84d 100644 --- a/trunk/include/asm-arm/bitops.h +++ b/trunk/include/asm-arm/bitops.h @@ -277,16 +277,9 @@ static inline int constant_fls(int x) * the clz instruction for much better code efficiency. */ -#define __fls(x) \ +#define fls(x) \ ( __builtin_constant_p(x) ? constant_fls(x) : \ ({ int __r; asm("clz\t%0, %1" : "=r"(__r) : "r"(x) : "cc"); 32-__r; }) ) - -/* Implement fls() in C so that 64-bit args are suitably truncated */ -static inline int fls(int x) -{ - return __fls(x); -} - #define ffs(x) ({ unsigned long __t = (x); fls(__t & -__t); }) #define __ffs(x) (ffs(x) - 1) #define ffz(x) __ffs( ~(x) ) diff --git a/trunk/include/asm-arm/cacheflush.h b/trunk/include/asm-arm/cacheflush.h index e68a1cbcc852..03cf1ee977b7 100644 --- a/trunk/include/asm-arm/cacheflush.h +++ b/trunk/include/asm-arm/cacheflush.h @@ -459,19 +459,15 @@ static inline void flush_ioremap_region(unsigned long phys, void __iomem *virt, #define __cacheid_vivt_asid_tagged_instr(val) (__cacheid_type_v7(val) ? ((val & (3 << 14)) == (1 << 14)) : 0) #if defined(CONFIG_CPU_CACHE_VIVT) && !defined(CONFIG_CPU_CACHE_VIPT) -/* - * VIVT caches only - */ + #define cache_is_vivt() 1 #define cache_is_vipt() 0 #define cache_is_vipt_nonaliasing() 0 #define cache_is_vipt_aliasing() 0 #define icache_is_vivt_asid_tagged() 0 -#elif !defined(CONFIG_CPU_CACHE_VIVT) && defined(CONFIG_CPU_CACHE_VIPT) -/* - * VIPT caches only - */ +#elif defined(CONFIG_CPU_CACHE_VIPT) + #define cache_is_vivt() 0 #define cache_is_vipt() 1 #define cache_is_vipt_nonaliasing() \ @@ -493,12 +489,7 @@ static inline void flush_ioremap_region(unsigned long phys, void __iomem *virt, }) #else -/* - * VIVT or VIPT caches. Note that this is unreliable since ARM926 - * and V6 CPUs satisfy the "(val & (15 << 25)) == (14 << 25)" test. - * There's no way to tell from the CacheType register what type (!) - * the cache is. - */ + #define cache_is_vivt() \ ({ \ unsigned int __val = read_cpuid(CPUID_CACHETYPE); \ diff --git a/trunk/include/asm-arm/irq.h b/trunk/include/asm-arm/irq.h index 9cb01907e43b..1b882a255e35 100644 --- a/trunk/include/asm-arm/irq.h +++ b/trunk/include/asm-arm/irq.h @@ -19,6 +19,23 @@ #define NO_IRQ ((unsigned int)(-1)) #endif + +/* + * Migration helpers + */ +#define __IRQT_FALEDGE IRQ_TYPE_EDGE_FALLING +#define __IRQT_RISEDGE IRQ_TYPE_EDGE_RISING +#define __IRQT_LOWLVL IRQ_TYPE_LEVEL_LOW +#define __IRQT_HIGHLVL IRQ_TYPE_LEVEL_HIGH + +#define IRQT_NOEDGE (0) +#define IRQT_RISING (__IRQT_RISEDGE) +#define IRQT_FALLING (__IRQT_FALEDGE) +#define IRQT_BOTHEDGE (__IRQT_RISEDGE|__IRQT_FALEDGE) +#define IRQT_LOW (__IRQT_LOWLVL) +#define IRQT_HIGH (__IRQT_HIGHLVL) +#define IRQT_PROBE IRQ_TYPE_PROBE + #ifndef __ASSEMBLY__ struct irqaction; extern void migrate_irqs(void); diff --git a/trunk/include/asm-arm/pci.h b/trunk/include/asm-arm/pci.h index 2d84792f2e12..75feb1574a69 100644 --- a/trunk/include/asm-arm/pci.h +++ b/trunk/include/asm-arm/pci.h @@ -78,14 +78,6 @@ pcibios_select_root(struct pci_dev *pdev, struct resource *res) return root; } -/* - * Dummy implementation; always return 0. - */ -static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) -{ - return 0; -} - #endif /* __KERNEL__ */ #endif diff --git a/trunk/include/asm-arm/plat-s3c/iic.h b/trunk/include/asm-arm/plat-s3c/iic.h index d08a1f2863e4..71211c8b5384 100644 --- a/trunk/include/asm-arm/plat-s3c/iic.h +++ b/trunk/include/asm-arm/plat-s3c/iic.h @@ -21,7 +21,6 @@ */ struct s3c2410_platform_i2c { - int bus_num; /* bus number to use */ unsigned int flags; unsigned int slave_addr; /* slave address for controller */ unsigned long bus_freq; /* standard bus frequency */ diff --git a/trunk/include/asm-sparc64/Kbuild b/trunk/include/asm-sparc64/Kbuild deleted file mode 100644 index 6cdaf9d33b38..000000000000 --- a/trunk/include/asm-sparc64/Kbuild +++ /dev/null @@ -1 +0,0 @@ -# dummy file to avoid breaking make headers_install diff --git a/trunk/include/asm-sparc64/agp.h b/trunk/include/asm-sparc64/agp.h deleted file mode 100644 index eb8d4b3f5163..000000000000 --- a/trunk/include/asm-sparc64/agp.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/apb.h b/trunk/include/asm-sparc64/apb.h deleted file mode 100644 index 5e236ca6e492..000000000000 --- a/trunk/include/asm-sparc64/apb.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/asi.h b/trunk/include/asm-sparc64/asi.h deleted file mode 100644 index 9b7110c516e8..000000000000 --- a/trunk/include/asm-sparc64/asi.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/atomic.h b/trunk/include/asm-sparc64/atomic.h deleted file mode 100644 index f5126826ba34..000000000000 --- a/trunk/include/asm-sparc64/atomic.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/auxio.h b/trunk/include/asm-sparc64/auxio.h deleted file mode 100644 index 46c9042f30b4..000000000000 --- a/trunk/include/asm-sparc64/auxio.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/auxvec.h b/trunk/include/asm-sparc64/auxvec.h deleted file mode 100644 index 1f45c67d7316..000000000000 --- a/trunk/include/asm-sparc64/auxvec.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/backoff.h b/trunk/include/asm-sparc64/backoff.h deleted file mode 100644 index 8ee26d947e0e..000000000000 --- a/trunk/include/asm-sparc64/backoff.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/bbc.h b/trunk/include/asm-sparc64/bbc.h deleted file mode 100644 index 06e8b6306514..000000000000 --- a/trunk/include/asm-sparc64/bbc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/bitops.h b/trunk/include/asm-sparc64/bitops.h deleted file mode 100644 index 204404355bdd..000000000000 --- a/trunk/include/asm-sparc64/bitops.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/bpp.h b/trunk/include/asm-sparc64/bpp.h deleted file mode 100644 index 514eee20272e..000000000000 --- a/trunk/include/asm-sparc64/bpp.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/bug.h b/trunk/include/asm-sparc64/bug.h deleted file mode 100644 index 3433737c7a67..000000000000 --- a/trunk/include/asm-sparc64/bug.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/bugs.h b/trunk/include/asm-sparc64/bugs.h deleted file mode 100644 index 04ae9e2818cf..000000000000 --- a/trunk/include/asm-sparc64/bugs.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/byteorder.h b/trunk/include/asm-sparc64/byteorder.h deleted file mode 100644 index f672855bee17..000000000000 --- a/trunk/include/asm-sparc64/byteorder.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/cache.h b/trunk/include/asm-sparc64/cache.h deleted file mode 100644 index fa9de5cadbf1..000000000000 --- a/trunk/include/asm-sparc64/cache.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/cacheflush.h b/trunk/include/asm-sparc64/cacheflush.h deleted file mode 100644 index cf5b6b3e8a55..000000000000 --- a/trunk/include/asm-sparc64/cacheflush.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/chafsr.h b/trunk/include/asm-sparc64/chafsr.h deleted file mode 100644 index aaab97562a39..000000000000 --- a/trunk/include/asm-sparc64/chafsr.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/checksum.h b/trunk/include/asm-sparc64/checksum.h deleted file mode 100644 index c3966c5e29d8..000000000000 --- a/trunk/include/asm-sparc64/checksum.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/chmctrl.h b/trunk/include/asm-sparc64/chmctrl.h deleted file mode 100644 index eb757b483b30..000000000000 --- a/trunk/include/asm-sparc64/chmctrl.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/cmt.h b/trunk/include/asm-sparc64/cmt.h deleted file mode 100644 index b19b445cb810..000000000000 --- a/trunk/include/asm-sparc64/cmt.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/compat.h b/trunk/include/asm-sparc64/compat.h deleted file mode 100644 index 8c155d221952..000000000000 --- a/trunk/include/asm-sparc64/compat.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/compat_signal.h b/trunk/include/asm-sparc64/compat_signal.h deleted file mode 100644 index 7187dcc8cac7..000000000000 --- a/trunk/include/asm-sparc64/compat_signal.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/cpudata.h b/trunk/include/asm-sparc64/cpudata.h deleted file mode 100644 index 3220e134a579..000000000000 --- a/trunk/include/asm-sparc64/cpudata.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/cputime.h b/trunk/include/asm-sparc64/cputime.h deleted file mode 100644 index 435f37a92f7c..000000000000 --- a/trunk/include/asm-sparc64/cputime.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/current.h b/trunk/include/asm-sparc64/current.h deleted file mode 100644 index a7904a7f53a8..000000000000 --- a/trunk/include/asm-sparc64/current.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/dcr.h b/trunk/include/asm-sparc64/dcr.h deleted file mode 100644 index d67613b1f5fe..000000000000 --- a/trunk/include/asm-sparc64/dcr.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/dcu.h b/trunk/include/asm-sparc64/dcu.h deleted file mode 100644 index 28853f4968d1..000000000000 --- a/trunk/include/asm-sparc64/dcu.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/delay.h b/trunk/include/asm-sparc64/delay.h deleted file mode 100644 index 33dc5589d841..000000000000 --- a/trunk/include/asm-sparc64/delay.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/device.h b/trunk/include/asm-sparc64/device.h deleted file mode 100644 index 4145c47097e2..000000000000 --- a/trunk/include/asm-sparc64/device.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/display7seg.h b/trunk/include/asm-sparc64/display7seg.h deleted file mode 100644 index e74f046b41de..000000000000 --- a/trunk/include/asm-sparc64/display7seg.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/div64.h b/trunk/include/asm-sparc64/div64.h deleted file mode 100644 index 928c94f99ecf..000000000000 --- a/trunk/include/asm-sparc64/div64.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/dma-mapping.h b/trunk/include/asm-sparc64/dma-mapping.h deleted file mode 100644 index 380b7b63147f..000000000000 --- a/trunk/include/asm-sparc64/dma-mapping.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/dma.h b/trunk/include/asm-sparc64/dma.h deleted file mode 100644 index 2e36248e6b59..000000000000 --- a/trunk/include/asm-sparc64/dma.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/ebus.h b/trunk/include/asm-sparc64/ebus.h deleted file mode 100644 index d7d476158bd5..000000000000 --- a/trunk/include/asm-sparc64/ebus.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/elf.h b/trunk/include/asm-sparc64/elf.h deleted file mode 100644 index f256d9472c82..000000000000 --- a/trunk/include/asm-sparc64/elf.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/emergency-restart.h b/trunk/include/asm-sparc64/emergency-restart.h deleted file mode 100644 index 2cac7b644da8..000000000000 --- a/trunk/include/asm-sparc64/emergency-restart.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/envctrl.h b/trunk/include/asm-sparc64/envctrl.h deleted file mode 100644 index a2cc0ca334ba..000000000000 --- a/trunk/include/asm-sparc64/envctrl.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/errno.h b/trunk/include/asm-sparc64/errno.h deleted file mode 100644 index 9701fe01cc53..000000000000 --- a/trunk/include/asm-sparc64/errno.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/estate.h b/trunk/include/asm-sparc64/estate.h deleted file mode 100644 index bedd0ef5f19c..000000000000 --- a/trunk/include/asm-sparc64/estate.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/fb.h b/trunk/include/asm-sparc64/fb.h deleted file mode 100644 index 1c2ac5832f39..000000000000 --- a/trunk/include/asm-sparc64/fb.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/fbio.h b/trunk/include/asm-sparc64/fbio.h deleted file mode 100644 index c17edf8c7bc4..000000000000 --- a/trunk/include/asm-sparc64/fbio.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/fcntl.h b/trunk/include/asm-sparc64/fcntl.h deleted file mode 100644 index 8b1beae48cd1..000000000000 --- a/trunk/include/asm-sparc64/fcntl.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/fhc.h b/trunk/include/asm-sparc64/fhc.h deleted file mode 100644 index 73eb04c19c47..000000000000 --- a/trunk/include/asm-sparc64/fhc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/floppy.h b/trunk/include/asm-sparc64/floppy.h deleted file mode 100644 index 214878114436..000000000000 --- a/trunk/include/asm-sparc64/floppy.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/fpumacro.h b/trunk/include/asm-sparc64/fpumacro.h deleted file mode 100644 index 30d6d0f68bc3..000000000000 --- a/trunk/include/asm-sparc64/fpumacro.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/futex.h b/trunk/include/asm-sparc64/futex.h deleted file mode 100644 index 1ceb0bb2fe53..000000000000 --- a/trunk/include/asm-sparc64/futex.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/hardirq.h b/trunk/include/asm-sparc64/hardirq.h deleted file mode 100644 index 63dca3db11f3..000000000000 --- a/trunk/include/asm-sparc64/hardirq.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/head.h b/trunk/include/asm-sparc64/head.h deleted file mode 100644 index 2254c09e53f9..000000000000 --- a/trunk/include/asm-sparc64/head.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/hugetlb.h b/trunk/include/asm-sparc64/hugetlb.h deleted file mode 100644 index 21d8f0a9c243..000000000000 --- a/trunk/include/asm-sparc64/hugetlb.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/hvtramp.h b/trunk/include/asm-sparc64/hvtramp.h deleted file mode 100644 index fb46bfe934a7..000000000000 --- a/trunk/include/asm-sparc64/hvtramp.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/hw_irq.h b/trunk/include/asm-sparc64/hw_irq.h deleted file mode 100644 index 16920a291f51..000000000000 --- a/trunk/include/asm-sparc64/hw_irq.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/hypervisor.h b/trunk/include/asm-sparc64/hypervisor.h deleted file mode 100644 index fe7e51a9e429..000000000000 --- a/trunk/include/asm-sparc64/hypervisor.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/ide.h b/trunk/include/asm-sparc64/ide.h deleted file mode 100644 index 7125317a428d..000000000000 --- a/trunk/include/asm-sparc64/ide.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/idprom.h b/trunk/include/asm-sparc64/idprom.h deleted file mode 100644 index c22f9c30bc78..000000000000 --- a/trunk/include/asm-sparc64/idprom.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/intr_queue.h b/trunk/include/asm-sparc64/intr_queue.h deleted file mode 100644 index f7225015b3db..000000000000 --- a/trunk/include/asm-sparc64/intr_queue.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/io.h b/trunk/include/asm-sparc64/io.h deleted file mode 100644 index 25ff258dfd33..000000000000 --- a/trunk/include/asm-sparc64/io.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/ioctl.h b/trunk/include/asm-sparc64/ioctl.h deleted file mode 100644 index 18fc5623ff51..000000000000 --- a/trunk/include/asm-sparc64/ioctl.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/ioctls.h b/trunk/include/asm-sparc64/ioctls.h deleted file mode 100644 index dcd5540ec103..000000000000 --- a/trunk/include/asm-sparc64/ioctls.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/iommu.h b/trunk/include/asm-sparc64/iommu.h deleted file mode 100644 index 76252bb85e97..000000000000 --- a/trunk/include/asm-sparc64/iommu.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/ipcbuf.h b/trunk/include/asm-sparc64/ipcbuf.h deleted file mode 100644 index 41dfaf1149b5..000000000000 --- a/trunk/include/asm-sparc64/ipcbuf.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/irq.h b/trunk/include/asm-sparc64/irq.h deleted file mode 100644 index b2102e65947c..000000000000 --- a/trunk/include/asm-sparc64/irq.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/irq_regs.h b/trunk/include/asm-sparc64/irq_regs.h deleted file mode 100644 index 1e2b8a1e745a..000000000000 --- a/trunk/include/asm-sparc64/irq_regs.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/irqflags.h b/trunk/include/asm-sparc64/irqflags.h deleted file mode 100644 index 27b091fc3fa0..000000000000 --- a/trunk/include/asm-sparc64/irqflags.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/kdebug.h b/trunk/include/asm-sparc64/kdebug.h deleted file mode 100644 index 78cfd5d2749b..000000000000 --- a/trunk/include/asm-sparc64/kdebug.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/kgdb.h b/trunk/include/asm-sparc64/kgdb.h deleted file mode 100644 index aa6532fd3a13..000000000000 --- a/trunk/include/asm-sparc64/kgdb.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/kmap_types.h b/trunk/include/asm-sparc64/kmap_types.h deleted file mode 100644 index 276530cf5395..000000000000 --- a/trunk/include/asm-sparc64/kmap_types.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/kprobes.h b/trunk/include/asm-sparc64/kprobes.h deleted file mode 100644 index c55e43e4d2a4..000000000000 --- a/trunk/include/asm-sparc64/kprobes.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/ldc.h b/trunk/include/asm-sparc64/ldc.h deleted file mode 100644 index 40f3f231c457..000000000000 --- a/trunk/include/asm-sparc64/ldc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/linkage.h b/trunk/include/asm-sparc64/linkage.h deleted file mode 100644 index 3ea4fd13f193..000000000000 --- a/trunk/include/asm-sparc64/linkage.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/lmb.h b/trunk/include/asm-sparc64/lmb.h deleted file mode 100644 index 3d04981701e2..000000000000 --- a/trunk/include/asm-sparc64/lmb.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/local.h b/trunk/include/asm-sparc64/local.h deleted file mode 100644 index c11c530f74d0..000000000000 --- a/trunk/include/asm-sparc64/local.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/lsu.h b/trunk/include/asm-sparc64/lsu.h deleted file mode 100644 index 4e3d8b128a58..000000000000 --- a/trunk/include/asm-sparc64/lsu.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/mc146818rtc.h b/trunk/include/asm-sparc64/mc146818rtc.h deleted file mode 100644 index 97842e6ed1c2..000000000000 --- a/trunk/include/asm-sparc64/mc146818rtc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/mdesc.h b/trunk/include/asm-sparc64/mdesc.h deleted file mode 100644 index 165a19347286..000000000000 --- a/trunk/include/asm-sparc64/mdesc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/mman.h b/trunk/include/asm-sparc64/mman.h deleted file mode 100644 index 17ddb1724f51..000000000000 --- a/trunk/include/asm-sparc64/mman.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/mmu.h b/trunk/include/asm-sparc64/mmu.h deleted file mode 100644 index e677a64d8db1..000000000000 --- a/trunk/include/asm-sparc64/mmu.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/mmu_context.h b/trunk/include/asm-sparc64/mmu_context.h deleted file mode 100644 index 877fee94bd4e..000000000000 --- a/trunk/include/asm-sparc64/mmu_context.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/mmzone.h b/trunk/include/asm-sparc64/mmzone.h deleted file mode 100644 index 43a710f7892a..000000000000 --- a/trunk/include/asm-sparc64/mmzone.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/module.h b/trunk/include/asm-sparc64/module.h deleted file mode 100644 index a9606db55e4a..000000000000 --- a/trunk/include/asm-sparc64/module.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/mostek.h b/trunk/include/asm-sparc64/mostek.h deleted file mode 100644 index 95a752f7e875..000000000000 --- a/trunk/include/asm-sparc64/mostek.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/msgbuf.h b/trunk/include/asm-sparc64/msgbuf.h deleted file mode 100644 index 5b33cc9d9bfb..000000000000 --- a/trunk/include/asm-sparc64/msgbuf.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/mutex.h b/trunk/include/asm-sparc64/mutex.h deleted file mode 100644 index c0c0f8f260d6..000000000000 --- a/trunk/include/asm-sparc64/mutex.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/ns87303.h b/trunk/include/asm-sparc64/ns87303.h deleted file mode 100644 index 5f369d4df3db..000000000000 --- a/trunk/include/asm-sparc64/ns87303.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/of_device.h b/trunk/include/asm-sparc64/of_device.h deleted file mode 100644 index a769fdbe164a..000000000000 --- a/trunk/include/asm-sparc64/of_device.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/of_platform.h b/trunk/include/asm-sparc64/of_platform.h deleted file mode 100644 index f7c427b8bc61..000000000000 --- a/trunk/include/asm-sparc64/of_platform.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/openprom.h b/trunk/include/asm-sparc64/openprom.h deleted file mode 100644 index acf4b234fae3..000000000000 --- a/trunk/include/asm-sparc64/openprom.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/openpromio.h b/trunk/include/asm-sparc64/openpromio.h deleted file mode 100644 index 122fabda21f1..000000000000 --- a/trunk/include/asm-sparc64/openpromio.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/oplib.h b/trunk/include/asm-sparc64/oplib.h deleted file mode 100644 index d93e44e63510..000000000000 --- a/trunk/include/asm-sparc64/oplib.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/page.h b/trunk/include/asm-sparc64/page.h deleted file mode 100644 index f46c1fb53028..000000000000 --- a/trunk/include/asm-sparc64/page.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/param.h b/trunk/include/asm-sparc64/param.h deleted file mode 100644 index 40c6dc110822..000000000000 --- a/trunk/include/asm-sparc64/param.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/parport.h b/trunk/include/asm-sparc64/parport.h deleted file mode 100644 index b4e4ca812eb6..000000000000 --- a/trunk/include/asm-sparc64/parport.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/pci.h b/trunk/include/asm-sparc64/pci.h deleted file mode 100644 index da54c4d1f39c..000000000000 --- a/trunk/include/asm-sparc64/pci.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/percpu.h b/trunk/include/asm-sparc64/percpu.h deleted file mode 100644 index 292729bb350f..000000000000 --- a/trunk/include/asm-sparc64/percpu.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/perfctr.h b/trunk/include/asm-sparc64/perfctr.h deleted file mode 100644 index 52073a9f8e30..000000000000 --- a/trunk/include/asm-sparc64/perfctr.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/pgalloc.h b/trunk/include/asm-sparc64/pgalloc.h deleted file mode 100644 index bec31641011c..000000000000 --- a/trunk/include/asm-sparc64/pgalloc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/pgtable.h b/trunk/include/asm-sparc64/pgtable.h deleted file mode 100644 index 9decbd99aeff..000000000000 --- a/trunk/include/asm-sparc64/pgtable.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/pil.h b/trunk/include/asm-sparc64/pil.h deleted file mode 100644 index d805f33f1e0f..000000000000 --- a/trunk/include/asm-sparc64/pil.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/poll.h b/trunk/include/asm-sparc64/poll.h deleted file mode 100644 index 8e2f31b4641a..000000000000 --- a/trunk/include/asm-sparc64/poll.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/posix_types.h b/trunk/include/asm-sparc64/posix_types.h deleted file mode 100644 index 8cee99200232..000000000000 --- a/trunk/include/asm-sparc64/posix_types.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/processor.h b/trunk/include/asm-sparc64/processor.h deleted file mode 100644 index 21de6cc182eb..000000000000 --- a/trunk/include/asm-sparc64/processor.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/prom.h b/trunk/include/asm-sparc64/prom.h deleted file mode 100644 index 5fa166ee3ffa..000000000000 --- a/trunk/include/asm-sparc64/prom.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/psrcompat.h b/trunk/include/asm-sparc64/psrcompat.h deleted file mode 100644 index 587846f48358..000000000000 --- a/trunk/include/asm-sparc64/psrcompat.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/pstate.h b/trunk/include/asm-sparc64/pstate.h deleted file mode 100644 index 3ccf0be25360..000000000000 --- a/trunk/include/asm-sparc64/pstate.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/ptrace.h b/trunk/include/asm-sparc64/ptrace.h deleted file mode 100644 index 1a55b9fb3b0c..000000000000 --- a/trunk/include/asm-sparc64/ptrace.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/reboot.h b/trunk/include/asm-sparc64/reboot.h deleted file mode 100644 index 0d72eb811cc8..000000000000 --- a/trunk/include/asm-sparc64/reboot.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/reg.h b/trunk/include/asm-sparc64/reg.h deleted file mode 100644 index 495bab27da07..000000000000 --- a/trunk/include/asm-sparc64/reg.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/resource.h b/trunk/include/asm-sparc64/resource.h deleted file mode 100644 index 46e3bc0de476..000000000000 --- a/trunk/include/asm-sparc64/resource.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/rtc.h b/trunk/include/asm-sparc64/rtc.h deleted file mode 100644 index e49a9685aead..000000000000 --- a/trunk/include/asm-sparc64/rtc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/rwsem-const.h b/trunk/include/asm-sparc64/rwsem-const.h deleted file mode 100644 index 2a1de315c86a..000000000000 --- a/trunk/include/asm-sparc64/rwsem-const.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/rwsem.h b/trunk/include/asm-sparc64/rwsem.h deleted file mode 100644 index 6943c56ed087..000000000000 --- a/trunk/include/asm-sparc64/rwsem.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/sbus.h b/trunk/include/asm-sparc64/sbus.h deleted file mode 100644 index 0cab0e89b874..000000000000 --- a/trunk/include/asm-sparc64/sbus.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/scatterlist.h b/trunk/include/asm-sparc64/scatterlist.h deleted file mode 100644 index b7fef95953ca..000000000000 --- a/trunk/include/asm-sparc64/scatterlist.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/scratchpad.h b/trunk/include/asm-sparc64/scratchpad.h deleted file mode 100644 index 23675f6a915a..000000000000 --- a/trunk/include/asm-sparc64/scratchpad.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/seccomp.h b/trunk/include/asm-sparc64/seccomp.h deleted file mode 100644 index f22f02a08a61..000000000000 --- a/trunk/include/asm-sparc64/seccomp.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/sections.h b/trunk/include/asm-sparc64/sections.h deleted file mode 100644 index 721496f8b2be..000000000000 --- a/trunk/include/asm-sparc64/sections.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/sembuf.h b/trunk/include/asm-sparc64/sembuf.h deleted file mode 100644 index c55b95214136..000000000000 --- a/trunk/include/asm-sparc64/sembuf.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/setup.h b/trunk/include/asm-sparc64/setup.h deleted file mode 100644 index 7143d06b2c55..000000000000 --- a/trunk/include/asm-sparc64/setup.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/sfafsr.h b/trunk/include/asm-sparc64/sfafsr.h deleted file mode 100644 index 8036fc377a4d..000000000000 --- a/trunk/include/asm-sparc64/sfafsr.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/sfp-machine.h b/trunk/include/asm-sparc64/sfp-machine.h deleted file mode 100644 index 7bbc4fecdc7d..000000000000 --- a/trunk/include/asm-sparc64/sfp-machine.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/shmbuf.h b/trunk/include/asm-sparc64/shmbuf.h deleted file mode 100644 index 0c54a2d68681..000000000000 --- a/trunk/include/asm-sparc64/shmbuf.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/shmparam.h b/trunk/include/asm-sparc64/shmparam.h deleted file mode 100644 index 5fa3a9b05e7f..000000000000 --- a/trunk/include/asm-sparc64/shmparam.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/sigcontext.h b/trunk/include/asm-sparc64/sigcontext.h deleted file mode 100644 index 5b16dcce44f2..000000000000 --- a/trunk/include/asm-sparc64/sigcontext.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/siginfo.h b/trunk/include/asm-sparc64/siginfo.h deleted file mode 100644 index 8ffd6ebabc7a..000000000000 --- a/trunk/include/asm-sparc64/siginfo.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/signal.h b/trunk/include/asm-sparc64/signal.h deleted file mode 100644 index 79705e5d49c3..000000000000 --- a/trunk/include/asm-sparc64/signal.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/smp.h b/trunk/include/asm-sparc64/smp.h deleted file mode 100644 index 5095a2cbea52..000000000000 --- a/trunk/include/asm-sparc64/smp.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/socket.h b/trunk/include/asm-sparc64/socket.h deleted file mode 100644 index 13e0d5d94bb3..000000000000 --- a/trunk/include/asm-sparc64/socket.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/sockios.h b/trunk/include/asm-sparc64/sockios.h deleted file mode 100644 index 2cb4b641482c..000000000000 --- a/trunk/include/asm-sparc64/sockios.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/sparsemem.h b/trunk/include/asm-sparc64/sparsemem.h deleted file mode 100644 index e681f22a97ae..000000000000 --- a/trunk/include/asm-sparc64/sparsemem.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/spinlock.h b/trunk/include/asm-sparc64/spinlock.h deleted file mode 100644 index 0115b8156eb8..000000000000 --- a/trunk/include/asm-sparc64/spinlock.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/spinlock_types.h b/trunk/include/asm-sparc64/spinlock_types.h deleted file mode 100644 index 48d81c8734b5..000000000000 --- a/trunk/include/asm-sparc64/spinlock_types.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/spitfire.h b/trunk/include/asm-sparc64/spitfire.h deleted file mode 100644 index 4430d2fbb0dc..000000000000 --- a/trunk/include/asm-sparc64/spitfire.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/sstate.h b/trunk/include/asm-sparc64/sstate.h deleted file mode 100644 index 97720ce2fd43..000000000000 --- a/trunk/include/asm-sparc64/sstate.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/stacktrace.h b/trunk/include/asm-sparc64/stacktrace.h deleted file mode 100644 index adc9b92c0ef1..000000000000 --- a/trunk/include/asm-sparc64/stacktrace.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/starfire.h b/trunk/include/asm-sparc64/starfire.h deleted file mode 100644 index db97daa3bed4..000000000000 --- a/trunk/include/asm-sparc64/starfire.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/stat.h b/trunk/include/asm-sparc64/stat.h deleted file mode 100644 index b108a866256b..000000000000 --- a/trunk/include/asm-sparc64/stat.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/statfs.h b/trunk/include/asm-sparc64/statfs.h deleted file mode 100644 index 5503d6a4c67e..000000000000 --- a/trunk/include/asm-sparc64/statfs.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/string.h b/trunk/include/asm-sparc64/string.h deleted file mode 100644 index 5018cd8b6ad0..000000000000 --- a/trunk/include/asm-sparc64/string.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/sunbpp.h b/trunk/include/asm-sparc64/sunbpp.h deleted file mode 100644 index 9632be290eb5..000000000000 --- a/trunk/include/asm-sparc64/sunbpp.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/syscalls.h b/trunk/include/asm-sparc64/syscalls.h deleted file mode 100644 index 3477b16e30ca..000000000000 --- a/trunk/include/asm-sparc64/syscalls.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/system.h b/trunk/include/asm-sparc64/system.h deleted file mode 100644 index be2603c2e527..000000000000 --- a/trunk/include/asm-sparc64/system.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/termbits.h b/trunk/include/asm-sparc64/termbits.h deleted file mode 100644 index e03f97592c70..000000000000 --- a/trunk/include/asm-sparc64/termbits.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/termios.h b/trunk/include/asm-sparc64/termios.h deleted file mode 100644 index 940495eb05cc..000000000000 --- a/trunk/include/asm-sparc64/termios.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/thread_info.h b/trunk/include/asm-sparc64/thread_info.h deleted file mode 100644 index 92bed7913395..000000000000 --- a/trunk/include/asm-sparc64/thread_info.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/timer.h b/trunk/include/asm-sparc64/timer.h deleted file mode 100644 index 88026d83cc93..000000000000 --- a/trunk/include/asm-sparc64/timer.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/timex.h b/trunk/include/asm-sparc64/timex.h deleted file mode 100644 index 8dd59ee24b48..000000000000 --- a/trunk/include/asm-sparc64/timex.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/tlb.h b/trunk/include/asm-sparc64/tlb.h deleted file mode 100644 index ae92fce10936..000000000000 --- a/trunk/include/asm-sparc64/tlb.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/tlbflush.h b/trunk/include/asm-sparc64/tlbflush.h deleted file mode 100644 index a43979a06cd9..000000000000 --- a/trunk/include/asm-sparc64/tlbflush.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/topology.h b/trunk/include/asm-sparc64/topology.h deleted file mode 100644 index 46999b60fbba..000000000000 --- a/trunk/include/asm-sparc64/topology.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/tsb.h b/trunk/include/asm-sparc64/tsb.h deleted file mode 100644 index 3677a302ea3e..000000000000 --- a/trunk/include/asm-sparc64/tsb.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/ttable.h b/trunk/include/asm-sparc64/ttable.h deleted file mode 100644 index a550f1bf6f9b..000000000000 --- a/trunk/include/asm-sparc64/ttable.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/types.h b/trunk/include/asm-sparc64/types.h deleted file mode 100644 index cfbfad5043eb..000000000000 --- a/trunk/include/asm-sparc64/types.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/uaccess.h b/trunk/include/asm-sparc64/uaccess.h deleted file mode 100644 index 2872d22844f3..000000000000 --- a/trunk/include/asm-sparc64/uaccess.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/uctx.h b/trunk/include/asm-sparc64/uctx.h deleted file mode 100644 index 9e1b5794b07f..000000000000 --- a/trunk/include/asm-sparc64/uctx.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/unaligned.h b/trunk/include/asm-sparc64/unaligned.h deleted file mode 100644 index 19fbf9508acf..000000000000 --- a/trunk/include/asm-sparc64/unaligned.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/unistd.h b/trunk/include/asm-sparc64/unistd.h deleted file mode 100644 index ad86e0b7a455..000000000000 --- a/trunk/include/asm-sparc64/unistd.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/upa.h b/trunk/include/asm-sparc64/upa.h deleted file mode 100644 index aab72930815a..000000000000 --- a/trunk/include/asm-sparc64/upa.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/user.h b/trunk/include/asm-sparc64/user.h deleted file mode 100644 index 29fc6e906c29..000000000000 --- a/trunk/include/asm-sparc64/user.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/utrap.h b/trunk/include/asm-sparc64/utrap.h deleted file mode 100644 index b030a41f1895..000000000000 --- a/trunk/include/asm-sparc64/utrap.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/vga.h b/trunk/include/asm-sparc64/vga.h deleted file mode 100644 index fbf4d58a56f0..000000000000 --- a/trunk/include/asm-sparc64/vga.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/vio.h b/trunk/include/asm-sparc64/vio.h deleted file mode 100644 index 299b26ab81a7..000000000000 --- a/trunk/include/asm-sparc64/vio.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/visasm.h b/trunk/include/asm-sparc64/visasm.h deleted file mode 100644 index 837a12278f4a..000000000000 --- a/trunk/include/asm-sparc64/visasm.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/watchdog.h b/trunk/include/asm-sparc64/watchdog.h deleted file mode 100644 index b0f2857145f7..000000000000 --- a/trunk/include/asm-sparc64/watchdog.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-sparc64/xor.h b/trunk/include/asm-sparc64/xor.h deleted file mode 100644 index ef187cc07ed5..000000000000 --- a/trunk/include/asm-sparc64/xor.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index 5270d449ff9d..034c1ca6b332 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/include/linux/sched.h @@ -505,7 +505,7 @@ struct signal_struct { unsigned long nvcsw, nivcsw, cnvcsw, cnivcsw; unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt; unsigned long inblock, oublock, cinblock, coublock; - struct task_io_accounting ioac; + struct proc_io_accounting ioac; /* * Cumulative ns of scheduled CPU time for dead threads in the @@ -1253,7 +1253,7 @@ struct task_struct { unsigned long ptrace_message; siginfo_t *last_siginfo; /* For ptrace use. */ - struct task_io_accounting ioac; + struct proc_io_accounting ioac; #if defined(CONFIG_TASK_XACCT) u64 acct_rss_mem1; /* accumulated rss usage */ u64 acct_vm_mem1; /* accumulated virtual memory usage */ @@ -2183,22 +2183,22 @@ extern long sched_group_rt_period(struct task_group *tg); #ifdef CONFIG_TASK_XACCT static inline void add_rchar(struct task_struct *tsk, ssize_t amt) { - tsk->ioac.rchar += amt; + tsk->ioac.chr.rchar += amt; } static inline void add_wchar(struct task_struct *tsk, ssize_t amt) { - tsk->ioac.wchar += amt; + tsk->ioac.chr.wchar += amt; } static inline void inc_syscr(struct task_struct *tsk) { - tsk->ioac.syscr++; + tsk->ioac.chr.syscr++; } static inline void inc_syscw(struct task_struct *tsk) { - tsk->ioac.syscw++; + tsk->ioac.chr.syscw++; } #else static inline void add_rchar(struct task_struct *tsk, ssize_t amt) diff --git a/trunk/include/linux/task_io_accounting.h b/trunk/include/linux/task_io_accounting.h index 5e88afc9a2fb..165390f8b936 100644 --- a/trunk/include/linux/task_io_accounting.h +++ b/trunk/include/linux/task_io_accounting.h @@ -1,5 +1,5 @@ /* - * task_io_accounting: a structure which is used for recording a single task's + * proc_io_accounting: a structure which is used for recording a single task's * IO statistics. * * Don't include this header file directly - it is designed to be dragged in via @@ -8,8 +8,8 @@ * Blame akpm@osdl.org for all this. */ -struct task_io_accounting { #ifdef CONFIG_TASK_XACCT +struct task_chr_io_accounting { /* bytes read */ u64 rchar; /* bytes written */ @@ -18,9 +18,14 @@ struct task_io_accounting { u64 syscr; /* # of write syscalls */ u64 syscw; +}; +#else /* CONFIG_TASK_XACCT */ +struct task_chr_io_accounting { +}; #endif /* CONFIG_TASK_XACCT */ #ifdef CONFIG_TASK_IO_ACCOUNTING +struct task_io_accounting { /* * The number of bytes which this task has caused to be read from * storage. @@ -41,5 +46,13 @@ struct task_io_accounting { * information loss in doing that. */ u64 cancelled_write_bytes; +}; +#else /* CONFIG_TASK_IO_ACCOUNTING */ +struct task_io_accounting { +}; #endif /* CONFIG_TASK_IO_ACCOUNTING */ + +struct proc_io_accounting { + struct task_chr_io_accounting chr; + struct task_io_accounting blk; }; diff --git a/trunk/include/linux/task_io_accounting_ops.h b/trunk/include/linux/task_io_accounting_ops.h index 4d090f9ee608..e6f958ebe97f 100644 --- a/trunk/include/linux/task_io_accounting_ops.h +++ b/trunk/include/linux/task_io_accounting_ops.h @@ -9,7 +9,7 @@ #ifdef CONFIG_TASK_IO_ACCOUNTING static inline void task_io_account_read(size_t bytes) { - current->ioac.read_bytes += bytes; + current->ioac.blk.read_bytes += bytes; } /* @@ -18,12 +18,12 @@ static inline void task_io_account_read(size_t bytes) */ static inline unsigned long task_io_get_inblock(const struct task_struct *p) { - return p->ioac.read_bytes >> 9; + return p->ioac.blk.read_bytes >> 9; } static inline void task_io_account_write(size_t bytes) { - current->ioac.write_bytes += bytes; + current->ioac.blk.write_bytes += bytes; } /* @@ -32,25 +32,25 @@ static inline void task_io_account_write(size_t bytes) */ static inline unsigned long task_io_get_oublock(const struct task_struct *p) { - return p->ioac.write_bytes >> 9; + return p->ioac.blk.write_bytes >> 9; } static inline void task_io_account_cancelled_write(size_t bytes) { - current->ioac.cancelled_write_bytes += bytes; + current->ioac.blk.cancelled_write_bytes += bytes; } -static inline void task_io_accounting_init(struct task_io_accounting *ioac) +static inline void task_io_accounting_init(struct proc_io_accounting *ioac) { memset(ioac, 0, sizeof(*ioac)); } -static inline void task_blk_io_accounting_add(struct task_io_accounting *dst, - struct task_io_accounting *src) +static inline void task_blk_io_accounting_add(struct proc_io_accounting *dst, + struct proc_io_accounting *src) { - dst->read_bytes += src->read_bytes; - dst->write_bytes += src->write_bytes; - dst->cancelled_write_bytes += src->cancelled_write_bytes; + dst->blk.read_bytes += src->blk.read_bytes; + dst->blk.write_bytes += src->blk.write_bytes; + dst->blk.cancelled_write_bytes += src->blk.cancelled_write_bytes; } #else @@ -77,35 +77,35 @@ static inline void task_io_account_cancelled_write(size_t bytes) { } -static inline void task_io_accounting_init(struct task_io_accounting *ioac) +static inline void task_io_accounting_init(struct proc_io_accounting *ioac) { } -static inline void task_blk_io_accounting_add(struct task_io_accounting *dst, - struct task_io_accounting *src) +static inline void task_blk_io_accounting_add(struct proc_io_accounting *dst, + struct proc_io_accounting *src) { } #endif /* CONFIG_TASK_IO_ACCOUNTING */ #ifdef CONFIG_TASK_XACCT -static inline void task_chr_io_accounting_add(struct task_io_accounting *dst, - struct task_io_accounting *src) +static inline void task_chr_io_accounting_add(struct proc_io_accounting *dst, + struct proc_io_accounting *src) { - dst->rchar += src->rchar; - dst->wchar += src->wchar; - dst->syscr += src->syscr; - dst->syscw += src->syscw; + dst->chr.rchar += src->chr.rchar; + dst->chr.wchar += src->chr.wchar; + dst->chr.syscr += src->chr.syscr; + dst->chr.syscw += src->chr.syscw; } #else -static inline void task_chr_io_accounting_add(struct task_io_accounting *dst, - struct task_io_accounting *src) +static inline void task_chr_io_accounting_add(struct proc_io_accounting *dst, + struct proc_io_accounting *src) { } #endif /* CONFIG_TASK_XACCT */ -static inline void task_io_accounting_add(struct task_io_accounting *dst, - struct task_io_accounting *src) +static inline void task_io_accounting_add(struct proc_io_accounting *dst, + struct proc_io_accounting *src) { task_chr_io_accounting_add(dst, src); task_blk_io_accounting_add(dst, src); diff --git a/trunk/kernel/tsacct.c b/trunk/kernel/tsacct.c index 8ebcd8532dfb..f9cd2561689c 100644 --- a/trunk/kernel/tsacct.c +++ b/trunk/kernel/tsacct.c @@ -94,14 +94,14 @@ void xacct_add_tsk(struct taskstats *stats, struct task_struct *p) stats->hiwater_vm = mm->hiwater_vm * PAGE_SIZE / KB; mmput(mm); } - stats->read_char = p->ioac.rchar; - stats->write_char = p->ioac.wchar; - stats->read_syscalls = p->ioac.syscr; - stats->write_syscalls = p->ioac.syscw; + stats->read_char = p->ioac.chr.rchar; + stats->write_char = p->ioac.chr.wchar; + stats->read_syscalls = p->ioac.chr.syscr; + stats->write_syscalls = p->ioac.chr.syscw; #ifdef CONFIG_TASK_IO_ACCOUNTING - stats->read_bytes = p->ioac.read_bytes; - stats->write_bytes = p->ioac.write_bytes; - stats->cancelled_write_bytes = p->ioac.cancelled_write_bytes; + stats->read_bytes = p->ioac.blk.read_bytes; + stats->write_bytes = p->ioac.blk.write_bytes; + stats->cancelled_write_bytes = p->ioac.blk.cancelled_write_bytes; #else stats->read_bytes = 0; stats->write_bytes = 0; diff --git a/trunk/net/dccp/dccp.h b/trunk/net/dccp/dccp.h index 1c2e3ec2eb57..743d85fcd651 100644 --- a/trunk/net/dccp/dccp.h +++ b/trunk/net/dccp/dccp.h @@ -226,7 +226,7 @@ static inline void dccp_csum_outgoing(struct sk_buff *skb) extern void dccp_v4_send_check(struct sock *sk, int len, struct sk_buff *skb); -extern int dccp_retransmit_skb(struct sock *sk); +extern int dccp_retransmit_skb(struct sock *sk, struct sk_buff *skb); extern void dccp_send_ack(struct sock *sk); extern void dccp_reqsk_send_ack(struct sk_buff *sk, struct request_sock *rsk); diff --git a/trunk/net/dccp/ipv4.c b/trunk/net/dccp/ipv4.c index 882c5c4de69e..a835b88237cb 100644 --- a/trunk/net/dccp/ipv4.c +++ b/trunk/net/dccp/ipv4.c @@ -196,8 +196,8 @@ static inline void dccp_do_pmtu_discovery(struct sock *sk, static void dccp_v4_err(struct sk_buff *skb, u32 info) { const struct iphdr *iph = (struct iphdr *)skb->data; - const u8 offset = iph->ihl << 2; - const struct dccp_hdr *dh = (struct dccp_hdr *)(skb->data + offset); + const struct dccp_hdr *dh = (struct dccp_hdr *)(skb->data + + (iph->ihl << 2)); struct dccp_sock *dp; struct inet_sock *inet; const int type = icmp_hdr(skb)->type; @@ -207,8 +207,7 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info) int err; struct net *net = dev_net(skb->dev); - if (skb->len < offset + sizeof(*dh) || - skb->len < offset + __dccp_basic_hdr_len(dh)) { + if (skb->len < (iph->ihl << 2) + 8) { ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS); return; } @@ -239,7 +238,7 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info) dp = dccp_sk(sk); seq = dccp_hdr_seq(dh); if ((1 << sk->sk_state) & ~(DCCPF_REQUESTING | DCCPF_LISTEN) && - !between48(seq, dp->dccps_awl, dp->dccps_awh)) { + !between48(seq, dp->dccps_swl, dp->dccps_swh)) { NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS); goto out; } diff --git a/trunk/net/dccp/ipv6.c b/trunk/net/dccp/ipv6.c index 5e1ee0da2c40..da509127e00c 100644 --- a/trunk/net/dccp/ipv6.c +++ b/trunk/net/dccp/ipv6.c @@ -89,19 +89,12 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, { struct ipv6hdr *hdr = (struct ipv6hdr *)skb->data; const struct dccp_hdr *dh = (struct dccp_hdr *)(skb->data + offset); - struct dccp_sock *dp; struct ipv6_pinfo *np; struct sock *sk; int err; __u64 seq; struct net *net = dev_net(skb->dev); - if (skb->len < offset + sizeof(*dh) || - skb->len < offset + __dccp_basic_hdr_len(dh)) { - ICMP6_INC_STATS_BH(__in6_dev_get(skb->dev), ICMP6_MIB_INERRORS); - return; - } - sk = inet6_lookup(net, &dccp_hashinfo, &hdr->daddr, dh->dccph_dport, &hdr->saddr, dh->dccph_sport, inet6_iif(skb)); @@ -123,14 +116,6 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, if (sk->sk_state == DCCP_CLOSED) goto out; - dp = dccp_sk(sk); - seq = dccp_hdr_seq(dh); - if ((1 << sk->sk_state) & ~(DCCPF_REQUESTING | DCCPF_LISTEN) && - !between48(seq, dp->dccps_awl, dp->dccps_awh)) { - NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS); - goto out; - } - np = inet6_sk(sk); if (type == ICMPV6_PKT_TOOBIG) { @@ -183,6 +168,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, icmpv6_err_convert(type, code, &err); + seq = dccp_hdr_seq(dh); /* Might be for an request_sock */ switch (sk->sk_state) { struct request_sock *req, **prev; diff --git a/trunk/net/dccp/output.c b/trunk/net/dccp/output.c index d06945c7d3df..fe20068c5d8e 100644 --- a/trunk/net/dccp/output.c +++ b/trunk/net/dccp/output.c @@ -53,11 +53,8 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb) dccp_packet_hdr_len(dcb->dccpd_type); int err, set_ack = 1; u64 ackno = dp->dccps_gsr; - /* - * Increment GSS here already in case the option code needs it. - * Update GSS for real only if option processing below succeeds. - */ - dcb->dccpd_seq = ADD48(dp->dccps_gss, 1); + + dccp_inc_seqno(&dp->dccps_gss); switch (dcb->dccpd_type) { case DCCP_PKT_DATA: @@ -69,9 +66,6 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb) case DCCP_PKT_REQUEST: set_ack = 0; - /* Use ISS on the first (non-retransmitted) Request. */ - if (icsk->icsk_retransmits == 0) - dcb->dccpd_seq = dp->dccps_iss; /* fall through */ case DCCP_PKT_SYNC: @@ -90,6 +84,8 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb) break; } + dcb->dccpd_seq = dp->dccps_gss; + if (dccp_insert_options(sk, skb)) { kfree_skb(skb); return -EPROTO; @@ -107,7 +103,7 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb) /* XXX For now we're using only 48 bits sequence numbers */ dh->dccph_x = 1; - dccp_update_gss(sk, dcb->dccpd_seq); + dp->dccps_awh = dp->dccps_gss; dccp_hdr_set_seq(dh, dp->dccps_gss); if (set_ack) dccp_hdr_set_ack(dccp_hdr_ack_bits(skb), ackno); @@ -116,11 +112,6 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb) case DCCP_PKT_REQUEST: dccp_hdr_request(skb)->dccph_req_service = dp->dccps_service; - /* - * Limit Ack window to ISS <= P.ackno <= GSS, so that - * only Responses to Requests we sent are considered. - */ - dp->dccps_awl = dp->dccps_iss; break; case DCCP_PKT_RESET: dccp_hdr_reset(skb)->dccph_reset_code = @@ -293,26 +284,14 @@ void dccp_write_xmit(struct sock *sk, int block) } } -/** - * dccp_retransmit_skb - Retransmit Request, Close, or CloseReq packets - * There are only four retransmittable packet types in DCCP: - * - Request in client-REQUEST state (sec. 8.1.1), - * - CloseReq in server-CLOSEREQ state (sec. 8.3), - * - Close in node-CLOSING state (sec. 8.3), - * - Acks in client-PARTOPEN state (sec. 8.1.5, handled by dccp_delack_timer()). - * This function expects sk->sk_send_head to contain the original skb. - */ -int dccp_retransmit_skb(struct sock *sk) +int dccp_retransmit_skb(struct sock *sk, struct sk_buff *skb) { - WARN_ON(sk->sk_send_head == NULL); - if (inet_csk(sk)->icsk_af_ops->rebuild_header(sk) != 0) return -EHOSTUNREACH; /* Routing failure or similar. */ - /* this count is used to distinguish original and retransmitted skb */ - inet_csk(sk)->icsk_retransmits++; - - return dccp_transmit_skb(sk, skb_clone(sk->sk_send_head, GFP_ATOMIC)); + return dccp_transmit_skb(sk, (skb_cloned(skb) ? + pskb_copy(skb, GFP_ATOMIC): + skb_clone(skb, GFP_ATOMIC))); } struct sk_buff *dccp_make_response(struct sock *sk, struct dst_entry *dst, @@ -458,7 +437,19 @@ static inline void dccp_connect_init(struct sock *sk) dccp_sync_mss(sk, dst_mtu(dst)); - /* Initialise GAR as per 8.5; AWL/AWH are set in dccp_transmit_skb() */ + /* + * SWL and AWL are initially adjusted so that they are not less than + * the initial Sequence Numbers received and sent, respectively: + * SWL := max(GSR + 1 - floor(W/4), ISR), + * AWL := max(GSS - W' + 1, ISS). + * These adjustments MUST be applied only at the beginning of the + * connection. + */ + dccp_update_gss(sk, dp->dccps_iss); + dccp_set_seqno(&dp->dccps_awl, max48(dp->dccps_awl, dp->dccps_iss)); + + /* S.GAR - greatest valid acknowledgement number received on a non-Sync; + * initialized to S.ISS (sec. 8.5) */ dp->dccps_gar = dp->dccps_iss; icsk->icsk_retransmits = 0; diff --git a/trunk/net/dccp/timer.c b/trunk/net/dccp/timer.c index 54b3c7e9e016..6a5b961b6f5c 100644 --- a/trunk/net/dccp/timer.c +++ b/trunk/net/dccp/timer.c @@ -98,12 +98,22 @@ static void dccp_retransmit_timer(struct sock *sk) goto backoff; } + /* + * sk->sk_send_head has to have one skb with + * DCCP_SKB_CB(skb)->dccpd_type set to one of the retransmittable DCCP + * packet types. The only packets eligible for retransmission are: + * -- Requests in client-REQUEST state (sec. 8.1.1) + * -- Acks in client-PARTOPEN state (sec. 8.1.5) + * -- CloseReq in server-CLOSEREQ state (sec. 8.3) + * -- Close in node-CLOSING state (sec. 8.3) */ + WARN_ON(sk->sk_send_head == NULL); + /* * More than than 4MSL (8 minutes) has passed, a RESET(aborted) was * sent, no need to retransmit, this sock is dead. */ if (dccp_write_timeout(sk)) - return; + goto out; /* * We want to know the number of packets retransmitted, not the @@ -112,28 +122,30 @@ static void dccp_retransmit_timer(struct sock *sk) if (icsk->icsk_retransmits == 0) DCCP_INC_STATS_BH(DCCP_MIB_TIMEOUTS); - if (dccp_retransmit_skb(sk) != 0) { + if (dccp_retransmit_skb(sk, sk->sk_send_head) < 0) { /* * Retransmission failed because of local congestion, * do not backoff. */ - if (--icsk->icsk_retransmits == 0) + if (icsk->icsk_retransmits == 0) icsk->icsk_retransmits = 1; inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS, min(icsk->icsk_rto, TCP_RESOURCE_PROBE_INTERVAL), DCCP_RTO_MAX); - return; + goto out; } backoff: icsk->icsk_backoff++; + icsk->icsk_retransmits++; icsk->icsk_rto = min(icsk->icsk_rto << 1, DCCP_RTO_MAX); inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS, icsk->icsk_rto, DCCP_RTO_MAX); if (icsk->icsk_retransmits > sysctl_dccp_retries1) __sk_dst_reset(sk); +out:; } static void dccp_write_timer(unsigned long data) diff --git a/trunk/net/ipv4/ipcomp.c b/trunk/net/ipv4/ipcomp.c index 38ccb6dfb02e..a42b64d040c4 100644 --- a/trunk/net/ipv4/ipcomp.c +++ b/trunk/net/ipv4/ipcomp.c @@ -104,7 +104,9 @@ static int ipcomp_tunnel_attach(struct xfrm_state *x) static int ipcomp4_init_state(struct xfrm_state *x) { - int err = -EINVAL; + int err; + struct ipcomp_data *ipcd; + struct xfrm_algo_desc *calg_desc; x->props.header_len = 0; switch (x->props.mode) { diff --git a/trunk/net/ipv6/ipcomp6.c b/trunk/net/ipv6/ipcomp6.c index 4545e4306862..0cfcea42153a 100644 --- a/trunk/net/ipv6/ipcomp6.c +++ b/trunk/net/ipv6/ipcomp6.c @@ -134,7 +134,9 @@ static int ipcomp6_tunnel_attach(struct xfrm_state *x) static int ipcomp6_init_state(struct xfrm_state *x) { - int err = -EINVAL; + int err; + struct ipcomp_data *ipcd; + struct xfrm_algo_desc *calg_desc; x->props.header_len = 0; switch (x->props.mode) {