diff options
-rw-r--r-- | Makefile | 6 | ||||
-rw-r--r-- | arch/sparc/Kconfig | 1 | ||||
-rw-r--r-- | arch/sparc/include/asm/Kbuild | 45 | ||||
-rw-r--r-- | arch/sparc/include/asm/agp.h (renamed from include/asm-sparc/agp.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/apb.h (renamed from include/asm-sparc/apb.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/apc.h (renamed from include/asm-sparc/apc.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/asi.h (renamed from include/asm-sparc/asi.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/asmmacro.h (renamed from include/asm-sparc/asmmacro.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/atomic.h (renamed from include/asm-sparc/atomic.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/atomic_32.h (renamed from include/asm-sparc/atomic_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/atomic_64.h (renamed from include/asm-sparc/atomic_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/auxio.h (renamed from include/asm-sparc/auxio.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/auxio_32.h (renamed from include/asm-sparc/auxio_32.h) | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/auxio_64.h (renamed from include/asm-sparc/auxio_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/auxvec.h (renamed from include/asm-sparc/auxvec.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/backoff.h (renamed from include/asm-sparc/backoff.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/bbc.h (renamed from include/asm-sparc/bbc.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/bitext.h (renamed from include/asm-sparc/bitext.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/bitops.h (renamed from include/asm-sparc/bitops.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/bitops_32.h (renamed from include/asm-sparc/bitops_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/bitops_64.h (renamed from include/asm-sparc/bitops_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/bpp.h (renamed from include/asm-sparc/bpp.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/btfixup.h (renamed from include/asm-sparc/btfixup.h) | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/bug.h (renamed from include/asm-sparc/bug.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/bugs.h (renamed from include/asm-sparc/bugs.h) | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/byteorder.h (renamed from include/asm-sparc/byteorder.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/cache.h (renamed from include/asm-sparc/cache.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/cacheflush.h (renamed from include/asm-sparc/cacheflush.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/cacheflush_32.h (renamed from include/asm-sparc/cacheflush_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/cacheflush_64.h (renamed from include/asm-sparc/cacheflush_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/chafsr.h (renamed from include/asm-sparc/chafsr.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/checksum.h (renamed from include/asm-sparc/checksum.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/checksum_32.h (renamed from include/asm-sparc/checksum_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/checksum_64.h (renamed from include/asm-sparc/checksum_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/chmctrl.h (renamed from include/asm-sparc/chmctrl.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/clock.h (renamed from include/asm-sparc/clock.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/cmt.h (renamed from include/asm-sparc/cmt.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/compat.h (renamed from include/asm-sparc/compat.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/compat_signal.h (renamed from include/asm-sparc/compat_signal.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/contregs.h (renamed from include/asm-sparc/contregs.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/cpudata.h (renamed from include/asm-sparc/cpudata.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/cpudata_32.h (renamed from include/asm-sparc/cpudata_32.h) | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/cpudata_64.h (renamed from include/asm-sparc/cpudata_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/cputime.h (renamed from include/asm-sparc/cputime.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/current.h (renamed from include/asm-sparc/current.h) | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/cypress.h (renamed from include/asm-sparc/cypress.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/dcr.h (renamed from include/asm-sparc/dcr.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/dcu.h (renamed from include/asm-sparc/dcu.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/delay.h (renamed from include/asm-sparc/delay.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/delay_32.h (renamed from include/asm-sparc/delay_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/delay_64.h (renamed from include/asm-sparc/delay_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/device.h (renamed from include/asm-sparc/device.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/display7seg.h (renamed from include/asm-sparc/display7seg.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/div64.h (renamed from include/asm-sparc/div64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/dma-mapping.h (renamed from include/asm-sparc/dma-mapping.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/dma-mapping_32.h (renamed from include/asm-sparc/dma-mapping_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/dma-mapping_64.h (renamed from include/asm-sparc/dma-mapping_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/dma.h (renamed from include/asm-sparc/dma.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/dma_32.h (renamed from include/asm-sparc/dma_32.h) | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/dma_64.h (renamed from include/asm-sparc/dma_64.h) | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/ebus.h (renamed from include/asm-sparc/ebus.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/ebus_32.h (renamed from include/asm-sparc/ebus_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/ebus_64.h (renamed from include/asm-sparc/ebus_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/ecc.h (renamed from include/asm-sparc/ecc.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/eeprom.h (renamed from include/asm-sparc/eeprom.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/elf.h (renamed from include/asm-sparc/elf.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/elf_32.h (renamed from include/asm-sparc/elf_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/elf_64.h (renamed from include/asm-sparc/elf_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/emergency-restart.h (renamed from include/asm-sparc/emergency-restart.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/envctrl.h (renamed from include/asm-sparc/envctrl.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/errno.h (renamed from include/asm-sparc/errno.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/estate.h (renamed from include/asm-sparc/estate.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/fb.h (renamed from include/asm-sparc/fb.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/fbio.h (renamed from include/asm-sparc/fbio.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/fcntl.h (renamed from include/asm-sparc/fcntl.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/fhc.h (renamed from include/asm-sparc/fhc.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/fixmap.h (renamed from include/asm-sparc/fixmap.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/floppy.h (renamed from include/asm-sparc/floppy.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/floppy_32.h (renamed from include/asm-sparc/floppy_32.h) | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/floppy_64.h (renamed from include/asm-sparc/floppy_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/fpumacro.h (renamed from include/asm-sparc/fpumacro.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/ftrace.h (renamed from include/asm-sparc64/ftrace.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/futex.h (renamed from include/asm-sparc/futex.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/futex_32.h (renamed from include/asm-sparc/futex_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/futex_64.h (renamed from include/asm-sparc/futex_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/hardirq.h (renamed from include/asm-sparc/hardirq.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/hardirq_32.h (renamed from include/asm-sparc/hardirq_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/hardirq_64.h (renamed from include/asm-sparc/hardirq_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/head.h (renamed from include/asm-sparc/head.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/head_32.h (renamed from include/asm-sparc/head_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/head_64.h (renamed from include/asm-sparc/head_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/highmem.h (renamed from include/asm-sparc/highmem.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/hugetlb.h (renamed from include/asm-sparc/hugetlb.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/hvtramp.h (renamed from include/asm-sparc/hvtramp.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/hw_irq.h (renamed from include/asm-sparc/hw_irq.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/hypervisor.h (renamed from include/asm-sparc/hypervisor.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/ide.h (renamed from include/asm-sparc/ide.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/idprom.h (renamed from include/asm-sparc/idprom.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/intr_queue.h (renamed from include/asm-sparc/intr_queue.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/io-unit.h (renamed from include/asm-sparc/io-unit.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/io.h (renamed from include/asm-sparc/io.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/io_32.h (renamed from include/asm-sparc/io_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/io_64.h (renamed from include/asm-sparc/io_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/ioctl.h (renamed from include/asm-sparc/ioctl.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/ioctls.h (renamed from include/asm-sparc/ioctls.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/iommu.h (renamed from include/asm-sparc/iommu.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/iommu_32.h (renamed from include/asm-sparc/iommu_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/iommu_64.h (renamed from include/asm-sparc/iommu_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/ipcbuf.h (renamed from include/asm-sparc/ipcbuf.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/ipcbuf_32.h (renamed from include/asm-sparc/ipcbuf_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/ipcbuf_64.h (renamed from include/asm-sparc/ipcbuf_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/irq.h (renamed from include/asm-sparc/irq.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/irq_32.h (renamed from include/asm-sparc/irq_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/irq_64.h (renamed from include/asm-sparc/irq_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/irq_regs.h (renamed from include/asm-sparc/irq_regs.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/irqflags.h (renamed from include/asm-sparc/irqflags.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/irqflags_32.h (renamed from include/asm-sparc/irqflags_32.h) | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/irqflags_64.h (renamed from include/asm-sparc/irqflags_64.h) | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/jsflash.h (renamed from include/asm-sparc/jsflash.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/kdebug.h (renamed from include/asm-sparc/kdebug.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/kdebug_32.h (renamed from include/asm-sparc/kdebug_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/kdebug_64.h (renamed from include/asm-sparc/kdebug_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/kgdb.h (renamed from include/asm-sparc/kgdb.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/kmap_types.h (renamed from include/asm-sparc/kmap_types.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/kprobes.h (renamed from include/asm-sparc/kprobes.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/ldc.h (renamed from include/asm-sparc/ldc.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/linkage.h (renamed from include/asm-sparc/linkage.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/lmb.h (renamed from include/asm-sparc/lmb.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/local.h (renamed from include/asm-sparc/local.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/lsu.h (renamed from include/asm-sparc/lsu.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/machines.h (renamed from include/asm-sparc/machines.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/mbus.h (renamed from include/asm-sparc/mbus.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/mc146818rtc.h (renamed from include/asm-sparc/mc146818rtc.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/mc146818rtc_32.h (renamed from include/asm-sparc/mc146818rtc_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/mc146818rtc_64.h (renamed from include/asm-sparc/mc146818rtc_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/mdesc.h (renamed from include/asm-sparc/mdesc.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/memreg.h (renamed from include/asm-sparc/memreg.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/mman.h (renamed from include/asm-sparc/mman.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/mmu.h (renamed from include/asm-sparc/mmu.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/mmu_32.h (renamed from include/asm-sparc/mmu_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/mmu_64.h (renamed from include/asm-sparc/mmu_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/mmu_context.h (renamed from include/asm-sparc/mmu_context.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/mmu_context_32.h (renamed from include/asm-sparc/mmu_context_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/mmu_context_64.h (renamed from include/asm-sparc/mmu_context_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/mmzone.h (renamed from include/asm-sparc/mmzone.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/module.h (renamed from include/asm-sparc/module.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/module_32.h (renamed from include/asm-sparc/module_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/module_64.h (renamed from include/asm-sparc/module_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/mostek.h (renamed from include/asm-sparc/mostek.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/mostek_32.h (renamed from include/asm-sparc/mostek_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/mostek_64.h (renamed from include/asm-sparc/mostek_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/mpmbox.h (renamed from include/asm-sparc/mpmbox.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/msgbuf.h (renamed from include/asm-sparc/msgbuf.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/msi.h (renamed from include/asm-sparc/msi.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/mutex.h (renamed from include/asm-sparc/mutex.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/mxcc.h (renamed from include/asm-sparc/mxcc.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/ns87303.h (renamed from include/asm-sparc/ns87303.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/obio.h (renamed from include/asm-sparc/obio.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/of_device.h (renamed from include/asm-sparc/of_device.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/of_platform.h (renamed from include/asm-sparc/of_platform.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/of_platform_32.h (renamed from include/asm-sparc/of_platform_32.h) | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/of_platform_64.h (renamed from include/asm-sparc/of_platform_64.h) | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/openprom.h (renamed from include/asm-sparc/openprom.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/openprom_32.h (renamed from include/asm-sparc/openprom_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/openprom_64.h (renamed from include/asm-sparc/openprom_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/openpromio.h (renamed from include/asm-sparc/openpromio.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/oplib.h (renamed from include/asm-sparc/oplib.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/oplib_32.h (renamed from include/asm-sparc/oplib_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/oplib_64.h (renamed from include/asm-sparc/oplib_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/page.h (renamed from include/asm-sparc/page.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/page_32.h (renamed from include/asm-sparc/page_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/page_64.h (renamed from include/asm-sparc/page_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/param.h (renamed from include/asm-sparc/param.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/parport.h (renamed from include/asm-sparc/parport.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/pbm.h (renamed from include/asm-sparc/pbm.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/pci.h (renamed from include/asm-sparc/pci.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/pci_32.h (renamed from include/asm-sparc/pci_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/pci_64.h (renamed from include/asm-sparc/pci_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/pcic.h (renamed from include/asm-sparc/pcic.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/percpu.h (renamed from include/asm-sparc/percpu.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/percpu_32.h (renamed from include/asm-sparc/percpu_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/percpu_64.h (renamed from include/asm-sparc/percpu_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/perfctr.h (renamed from include/asm-sparc/perfctr.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/pgalloc.h (renamed from include/asm-sparc/pgalloc.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/pgalloc_32.h (renamed from include/asm-sparc/pgalloc_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/pgalloc_64.h (renamed from include/asm-sparc/pgalloc_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/pgtable.h (renamed from include/asm-sparc/pgtable.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/pgtable_32.h (renamed from include/asm-sparc/pgtable_32.h) | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/pgtable_64.h (renamed from include/asm-sparc/pgtable_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/pgtsrmmu.h (renamed from include/asm-sparc/pgtsrmmu.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/pgtsun4.h (renamed from include/asm-sparc/pgtsun4.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/pgtsun4c.h (renamed from include/asm-sparc/pgtsun4c.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/pil.h (renamed from include/asm-sparc/pil.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/poll.h (renamed from include/asm-sparc/poll.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/posix_types.h (renamed from include/asm-sparc/posix_types.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/posix_types_32.h (renamed from include/asm-sparc/posix_types_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/posix_types_64.h (renamed from include/asm-sparc/posix_types_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/processor.h (renamed from include/asm-sparc/processor.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/processor_32.h (renamed from include/asm-sparc/processor_32.h) | 3 | ||||
-rw-r--r-- | arch/sparc/include/asm/processor_64.h (renamed from include/asm-sparc/processor_64.h) | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/prom.h (renamed from include/asm-sparc/prom.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/psr.h (renamed from include/asm-sparc/psr.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/psrcompat.h (renamed from include/asm-sparc/psrcompat.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/pstate.h (renamed from include/asm-sparc/pstate.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/ptrace.h (renamed from include/asm-sparc/ptrace.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/ptrace_32.h (renamed from include/asm-sparc/ptrace_32.h) | 1 | ||||
-rw-r--r-- | arch/sparc/include/asm/ptrace_64.h (renamed from include/asm-sparc/ptrace_64.h) | 1 | ||||
-rw-r--r-- | arch/sparc/include/asm/reboot.h (renamed from include/asm-sparc/reboot.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/reg.h (renamed from include/asm-sparc/reg.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/reg_32.h (renamed from include/asm-sparc/reg_32.h) | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/reg_64.h (renamed from include/asm-sparc/reg_64.h) | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/resource.h (renamed from include/asm-sparc/resource.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/ross.h (renamed from include/asm-sparc/ross.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/rtc.h (renamed from include/asm-sparc/rtc.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/rwsem-const.h (renamed from include/asm-sparc/rwsem-const.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/rwsem.h (renamed from include/asm-sparc/rwsem.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/sbi.h (renamed from include/asm-sparc/sbi.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/sbus.h (renamed from include/asm-sparc/sbus.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/sbus_32.h (renamed from include/asm-sparc/sbus_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/sbus_64.h (renamed from include/asm-sparc/sbus_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/scatterlist.h (renamed from include/asm-sparc/scatterlist.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/scatterlist_32.h (renamed from include/asm-sparc/scatterlist_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/scatterlist_64.h (renamed from include/asm-sparc/scatterlist_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/scratchpad.h (renamed from include/asm-sparc/scratchpad.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/seccomp.h (renamed from include/asm-sparc/seccomp.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/sections.h (renamed from include/asm-sparc/sections.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/sections_32.h (renamed from include/asm-sparc/sections_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/sections_64.h (renamed from include/asm-sparc/sections_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/sembuf.h (renamed from include/asm-sparc/sembuf.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/setup.h (renamed from include/asm-sparc/setup.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/sfafsr.h (renamed from include/asm-sparc/sfafsr.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/sfp-machine.h (renamed from include/asm-sparc/sfp-machine.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/sfp-machine_32.h (renamed from include/asm-sparc/sfp-machine_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/sfp-machine_64.h (renamed from include/asm-sparc/sfp-machine_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/shmbuf.h (renamed from include/asm-sparc/shmbuf.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/shmparam.h (renamed from include/asm-sparc/shmparam.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/shmparam_32.h (renamed from include/asm-sparc/shmparam_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/shmparam_64.h (renamed from include/asm-sparc/shmparam_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/sigcontext.h (renamed from include/asm-sparc/sigcontext.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/sigcontext_32.h (renamed from include/asm-sparc/sigcontext_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/sigcontext_64.h (renamed from include/asm-sparc/sigcontext_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/siginfo.h (renamed from include/asm-sparc/siginfo.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/siginfo_32.h (renamed from include/asm-sparc/siginfo_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/siginfo_64.h (renamed from include/asm-sparc/siginfo_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/signal.h (renamed from include/asm-sparc/signal.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/signal_32.h (renamed from include/asm-sparc/signal_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/signal_64.h (renamed from include/asm-sparc/signal_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/smp.h (renamed from include/asm-sparc/smp.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/smp_32.h (renamed from include/asm-sparc/smp_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/smp_64.h (renamed from include/asm-sparc/smp_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/smpprim.h (renamed from include/asm-sparc/smpprim.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/socket.h (renamed from include/asm-sparc/socket.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/sockios.h (renamed from include/asm-sparc/sockios.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/sparsemem.h (renamed from include/asm-sparc/sparsemem.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/spinlock.h (renamed from include/asm-sparc/spinlock.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/spinlock_32.h (renamed from include/asm-sparc/spinlock_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/spinlock_64.h (renamed from include/asm-sparc/spinlock_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/spinlock_types.h (renamed from include/asm-sparc/spinlock_types.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/spitfire.h (renamed from include/asm-sparc/spitfire.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/sstate.h (renamed from include/asm-sparc/sstate.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/stacktrace.h (renamed from include/asm-sparc/stacktrace.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/starfire.h (renamed from include/asm-sparc/starfire.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/stat.h (renamed from include/asm-sparc/stat.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/stat_32.h (renamed from include/asm-sparc/stat_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/stat_64.h (renamed from include/asm-sparc/stat_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/statfs.h (renamed from include/asm-sparc/statfs.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/statfs_32.h (renamed from include/asm-sparc/statfs_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/statfs_64.h (renamed from include/asm-sparc/statfs_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/string.h (renamed from include/asm-sparc/string.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/string_32.h (renamed from include/asm-sparc/string_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/string_64.h (renamed from include/asm-sparc/string_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/sun4paddr.h (renamed from include/asm-sparc/sun4paddr.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/sun4prom.h (renamed from include/asm-sparc/sun4prom.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/sunbpp.h (renamed from include/asm-sparc/sunbpp.h) | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/swift.h (renamed from include/asm-sparc/swift.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/syscall.h | 120 | ||||
-rw-r--r-- | arch/sparc/include/asm/syscalls.h (renamed from include/asm-sparc/syscalls.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/sysen.h (renamed from include/asm-sparc/sysen.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/system.h (renamed from include/asm-sparc/system.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/system_32.h (renamed from include/asm-sparc/system_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/system_64.h (renamed from include/asm-sparc/system_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/termbits.h (renamed from include/asm-sparc/termbits.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/termios.h (renamed from include/asm-sparc/termios.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/thread_info.h (renamed from include/asm-sparc/thread_info.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/thread_info_32.h (renamed from include/asm-sparc/thread_info_32.h) | 7 | ||||
-rw-r--r-- | arch/sparc/include/asm/thread_info_64.h (renamed from include/asm-sparc/thread_info_64.h) | 8 | ||||
-rw-r--r-- | arch/sparc/include/asm/timer.h (renamed from include/asm-sparc/timer.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/timer_32.h (renamed from include/asm-sparc/timer_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/timer_64.h (renamed from include/asm-sparc/timer_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/timex.h (renamed from include/asm-sparc/timex.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/timex_32.h (renamed from include/asm-sparc/timex_32.h) | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/timex_64.h (renamed from include/asm-sparc/timex_64.h) | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/tlb.h (renamed from include/asm-sparc/tlb.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/tlb_32.h (renamed from include/asm-sparc/tlb_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/tlb_64.h (renamed from include/asm-sparc/tlb_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/tlbflush.h (renamed from include/asm-sparc/tlbflush.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/tlbflush_32.h (renamed from include/asm-sparc/tlbflush_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/tlbflush_64.h (renamed from include/asm-sparc/tlbflush_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/topology.h (renamed from include/asm-sparc/topology.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/topology_32.h (renamed from include/asm-sparc/topology_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/topology_64.h (renamed from include/asm-sparc/topology_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/traps.h (renamed from include/asm-sparc/traps.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/tsb.h (renamed from include/asm-sparc/tsb.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/tsunami.h (renamed from include/asm-sparc/tsunami.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/ttable.h (renamed from include/asm-sparc/ttable.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/turbosparc.h (renamed from include/asm-sparc/turbosparc.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/types.h (renamed from include/asm-sparc/types.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/uaccess.h (renamed from include/asm-sparc/uaccess.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/uaccess_32.h (renamed from include/asm-sparc/uaccess_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/uaccess_64.h (renamed from include/asm-sparc/uaccess_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/uctx.h (renamed from include/asm-sparc/uctx.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/unaligned.h (renamed from include/asm-sparc/unaligned.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/unistd.h (renamed from include/asm-sparc/unistd.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/unistd_32.h (renamed from include/asm-sparc/unistd_32.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/unistd_64.h (renamed from include/asm-sparc/unistd_64.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/upa.h (renamed from include/asm-sparc/upa.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/user.h (renamed from include/asm-sparc/user.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/utrap.h (renamed from include/asm-sparc/utrap.h) | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/vac-ops.h (renamed from include/asm-sparc/vac-ops.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/vaddrs.h (renamed from include/asm-sparc/vaddrs.h) | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/vfc_ioctls.h (renamed from include/asm-sparc/vfc_ioctls.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/vga.h (renamed from include/asm-sparc/vga.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/viking.h (renamed from include/asm-sparc/viking.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/vio.h (renamed from include/asm-sparc/vio.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/visasm.h (renamed from include/asm-sparc/visasm.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/watchdog.h (renamed from include/asm-sparc/watchdog.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/winmacro.h (renamed from include/asm-sparc/winmacro.h) | 0 | ||||
-rw-r--r-- | arch/sparc/include/asm/xor.h (renamed from include/asm-sparc/xor.h) | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/xor_32.h (renamed from include/asm-sparc/xor_32.h) | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/xor_64.h (renamed from include/asm-sparc/xor_64.h) | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/entry.S | 12 | ||||
-rw-r--r-- | arch/sparc/kernel/ptrace.c | 26 | ||||
-rw-r--r-- | arch/sparc/kernel/rtrap.S | 5 | ||||
-rw-r--r-- | arch/sparc/kernel/signal.c | 16 | ||||
-rw-r--r-- | arch/sparc64/Kconfig | 1 | ||||
-rw-r--r-- | arch/sparc64/kernel/compat_audit.c | 2 | ||||
-rw-r--r-- | arch/sparc64/kernel/entry.h | 3 | ||||
-rw-r--r-- | arch/sparc64/kernel/ptrace.c | 32 | ||||
-rw-r--r-- | arch/sparc64/kernel/rtrap.S | 6 | ||||
-rw-r--r-- | arch/sparc64/kernel/signal.c | 8 | ||||
-rw-r--r-- | arch/sparc64/kernel/signal32.c | 3 | ||||
-rw-r--r-- | arch/sparc64/kernel/syscalls.S | 4 | ||||
-rw-r--r-- | include/asm-sparc/Kbuild | 1 | ||||
-rw-r--r-- | include/asm-sparc64/Kbuild | 1 | ||||
-rw-r--r-- | include/asm-sparc64/agp.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/apb.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/asi.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/atomic.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/auxio.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/auxvec.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/backoff.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/bbc.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/bitops.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/bpp.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/bug.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/bugs.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/byteorder.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/cache.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/cacheflush.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/chafsr.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/checksum.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/chmctrl.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/cmt.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/compat.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/compat_signal.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/cpudata.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/cputime.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/current.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/dcr.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/dcu.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/delay.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/device.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/display7seg.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/div64.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/dma-mapping.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/dma.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/ebus.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/elf.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/emergency-restart.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/envctrl.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/errno.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/estate.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/fb.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/fbio.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/fcntl.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/fhc.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/floppy.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/fpumacro.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/futex.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/hardirq.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/head.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/hugetlb.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/hvtramp.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/hw_irq.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/hypervisor.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/ide.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/idprom.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/intr_queue.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/io.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/ioctl.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/ioctls.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/iommu.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/ipcbuf.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/irq.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/irq_regs.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/irqflags.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/kdebug.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/kgdb.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/kmap_types.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/kprobes.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/ldc.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/linkage.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/lmb.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/local.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/lsu.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/mc146818rtc.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/mdesc.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/mman.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/mmu.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/mmu_context.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/mmzone.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/module.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/mostek.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/msgbuf.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/mutex.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/ns87303.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/of_device.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/of_platform.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/openprom.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/openpromio.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/oplib.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/page.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/param.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/parport.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/pci.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/percpu.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/perfctr.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/pgalloc.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/pgtable.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/pil.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/poll.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/posix_types.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/processor.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/prom.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/psrcompat.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/pstate.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/ptrace.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/reboot.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/reg.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/resource.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/rtc.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/rwsem-const.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/rwsem.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/sbus.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/scatterlist.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/scratchpad.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/seccomp.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/sections.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/sembuf.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/setup.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/sfafsr.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/sfp-machine.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/shmbuf.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/shmparam.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/sigcontext.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/siginfo.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/signal.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/smp.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/socket.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/sockios.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/sparsemem.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/spinlock.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/spinlock_types.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/spitfire.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/sstate.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/stacktrace.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/starfire.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/stat.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/statfs.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/string.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/sunbpp.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/syscalls.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/system.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/termbits.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/termios.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/thread_info.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/timer.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/timex.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/tlb.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/tlbflush.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/topology.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/tsb.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/ttable.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/types.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/uaccess.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/uctx.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/unaligned.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/unistd.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/upa.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/user.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/utrap.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/vga.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/vio.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/visasm.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/watchdog.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/xor.h | 1 |
506 files changed, 403 insertions, 361 deletions
@@ -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/arch/sparc/Kconfig b/arch/sparc/Kconfig index 375de7c6d082..a214002114ed 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -68,6 +68,7 @@ config SPARC select HAVE_IDE select HAVE_OPROFILE select HAVE_ARCH_KGDB if !SMP + select HAVE_ARCH_TRACEHOOK # Identify this as a Sparc32 build config SPARC32 diff --git a/arch/sparc/include/asm/Kbuild b/arch/sparc/include/asm/Kbuild new file mode 100644 index 000000000000..a5f0ce734ff7 --- /dev/null +++ b/arch/sparc/include/asm/Kbuild @@ -0,0 +1,45 @@ +# User exported sparc header files +include include/asm-generic/Kbuild.asm + +header-y += ipcbuf_32.h +header-y += ipcbuf_64.h +header-y += posix_types_32.h +header-y += posix_types_64.h +header-y += ptrace_32.h +header-y += ptrace_64.h +header-y += sigcontext_32.h +header-y += sigcontext_64.h +header-y += siginfo_32.h +header-y += siginfo_64.h +header-y += signal_32.h +header-y += signal_64.h +header-y += stat_32.h +header-y += stat_64.h +header-y += statfs_32.h +header-y += statfs_64.h +header-y += unistd_32.h +header-y += unistd_64.h + +header-y += apc.h +header-y += asi.h +header-y += bpp.h +header-y += display7seg.h +header-y += envctrl.h +header-y += fbio.h +header-y += jsflash.h +header-y += openprom.h +header-y += openprom_32.h +header-y += openprom_64.h +header-y += openpromio.h +header-y += perfctr.h +header-y += psrcompat.h +header-y += psr.h +header-y += pstate.h +header-y += reg.h +header-y += reg_32.h +header-y += reg_64.h +header-y += traps.h +header-y += uctx.h +header-y += utrap.h +header-y += vfc_ioctls.h +header-y += watchdog.h diff --git a/include/asm-sparc/agp.h b/arch/sparc/include/asm/agp.h index c2456870b05c..c2456870b05c 100644 --- a/include/asm-sparc/agp.h +++ b/arch/sparc/include/asm/agp.h diff --git a/include/asm-sparc/apb.h b/arch/sparc/include/asm/apb.h index 8f3b57db810f..8f3b57db810f 100644 --- a/include/asm-sparc/apb.h +++ b/arch/sparc/include/asm/apb.h diff --git a/include/asm-sparc/apc.h b/arch/sparc/include/asm/apc.h index 24e9a7d4d97e..24e9a7d4d97e 100644 --- a/include/asm-sparc/apc.h +++ b/arch/sparc/include/asm/apc.h diff --git a/include/asm-sparc/asi.h b/arch/sparc/include/asm/asi.h index 74703c5ef985..74703c5ef985 100644 --- a/include/asm-sparc/asi.h +++ b/arch/sparc/include/asm/asi.h diff --git a/include/asm-sparc/asmmacro.h b/arch/sparc/include/asm/asmmacro.h index a619a4d97aae..a619a4d97aae 100644 --- a/include/asm-sparc/asmmacro.h +++ b/arch/sparc/include/asm/asmmacro.h diff --git a/include/asm-sparc/atomic.h b/arch/sparc/include/asm/atomic.h index 66d8166ec1d7..8ff83d8cc33f 100644 --- a/include/asm-sparc/atomic.h +++ b/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 <asm-sparc/atomic_64.h> +#include <asm/atomic_64.h> #else -#include <asm-sparc/atomic_32.h> +#include <asm/atomic_32.h> #endif #endif diff --git a/include/asm-sparc/atomic_32.h b/arch/sparc/include/asm/atomic_32.h index 5c944b5a8040..5c944b5a8040 100644 --- a/include/asm-sparc/atomic_32.h +++ b/arch/sparc/include/asm/atomic_32.h diff --git a/include/asm-sparc/atomic_64.h b/arch/sparc/include/asm/atomic_64.h index 2c71ec4a3b18..2c71ec4a3b18 100644 --- a/include/asm-sparc/atomic_64.h +++ b/arch/sparc/include/asm/atomic_64.h diff --git a/include/asm-sparc/auxio.h b/arch/sparc/include/asm/auxio.h index 24c6f3c0f577..13dc67f03011 100644 --- a/include/asm-sparc/auxio.h +++ b/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 <asm-sparc/auxio_64.h> +#include <asm/auxio_64.h> #else -#include <asm-sparc/auxio_32.h> +#include <asm/auxio_32.h> #endif #endif diff --git a/include/asm-sparc/auxio_32.h b/arch/sparc/include/asm/auxio_32.h index 4db8f23db20f..e03e088be95f 100644 --- a/include/asm-sparc/auxio_32.h +++ b/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/include/asm-sparc/auxio_64.h b/arch/sparc/include/asm/auxio_64.h index f61cd1e3e395..f61cd1e3e395 100644 --- a/include/asm-sparc/auxio_64.h +++ b/arch/sparc/include/asm/auxio_64.h diff --git a/include/asm-sparc/auxvec.h b/arch/sparc/include/asm/auxvec.h index ad6f360261f6..ad6f360261f6 100644 --- a/include/asm-sparc/auxvec.h +++ b/arch/sparc/include/asm/auxvec.h diff --git a/include/asm-sparc/backoff.h b/arch/sparc/include/asm/backoff.h index fa1fdf67e350..fa1fdf67e350 100644 --- a/include/asm-sparc/backoff.h +++ b/arch/sparc/include/asm/backoff.h diff --git a/include/asm-sparc/bbc.h b/arch/sparc/include/asm/bbc.h index 423a85800aae..423a85800aae 100644 --- a/include/asm-sparc/bbc.h +++ b/arch/sparc/include/asm/bbc.h diff --git a/include/asm-sparc/bitext.h b/arch/sparc/include/asm/bitext.h index 297b2f2fcb49..297b2f2fcb49 100644 --- a/include/asm-sparc/bitext.h +++ b/arch/sparc/include/asm/bitext.h diff --git a/include/asm-sparc/bitops.h b/arch/sparc/include/asm/bitops.h index 1a2949d0193f..b1edd94bd64f 100644 --- a/include/asm-sparc/bitops.h +++ b/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 <asm-sparc/bitops_64.h> +#include <asm/bitops_64.h> #else -#include <asm-sparc/bitops_32.h> +#include <asm/bitops_32.h> #endif #endif diff --git a/include/asm-sparc/bitops_32.h b/arch/sparc/include/asm/bitops_32.h index 68b98a7e6454..68b98a7e6454 100644 --- a/include/asm-sparc/bitops_32.h +++ b/arch/sparc/include/asm/bitops_32.h diff --git a/include/asm-sparc/bitops_64.h b/arch/sparc/include/asm/bitops_64.h index bb87b8080220..bb87b8080220 100644 --- a/include/asm-sparc/bitops_64.h +++ b/arch/sparc/include/asm/bitops_64.h diff --git a/include/asm-sparc/bpp.h b/arch/sparc/include/asm/bpp.h index 31f515e499a7..31f515e499a7 100644 --- a/include/asm-sparc/bpp.h +++ b/arch/sparc/include/asm/bpp.h diff --git a/include/asm-sparc/btfixup.h b/arch/sparc/include/asm/btfixup.h index 08277e6fb4cd..797722cf69f2 100644 --- a/include/asm-sparc/btfixup.h +++ b/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/include/asm-sparc/bug.h b/arch/sparc/include/asm/bug.h index 8a59e5a8c217..8a59e5a8c217 100644 --- a/include/asm-sparc/bug.h +++ b/arch/sparc/include/asm/bug.h diff --git a/include/asm-sparc/bugs.h b/arch/sparc/include/asm/bugs.h index 2dfc07bc8e54..e179bc12f64a 100644 --- a/include/asm-sparc/bugs.h +++ b/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/include/asm-sparc/byteorder.h b/arch/sparc/include/asm/byteorder.h index bcd83aa351c5..bcd83aa351c5 100644 --- a/include/asm-sparc/byteorder.h +++ b/arch/sparc/include/asm/byteorder.h diff --git a/include/asm-sparc/cache.h b/arch/sparc/include/asm/cache.h index 41f85ae4bd4a..41f85ae4bd4a 100644 --- a/include/asm-sparc/cache.h +++ b/arch/sparc/include/asm/cache.h diff --git a/include/asm-sparc/cacheflush.h b/arch/sparc/include/asm/cacheflush.h index 2b6a37957c2d..049168087b19 100644 --- a/include/asm-sparc/cacheflush.h +++ b/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 <asm-sparc/cacheflush_64.h> +#include <asm/cacheflush_64.h> #else -#include <asm-sparc/cacheflush_32.h> +#include <asm/cacheflush_32.h> #endif #endif diff --git a/include/asm-sparc/cacheflush_32.h b/arch/sparc/include/asm/cacheflush_32.h index 68ac10910271..68ac10910271 100644 --- a/include/asm-sparc/cacheflush_32.h +++ b/arch/sparc/include/asm/cacheflush_32.h diff --git a/include/asm-sparc/cacheflush_64.h b/arch/sparc/include/asm/cacheflush_64.h index c43321729b3b..c43321729b3b 100644 --- a/include/asm-sparc/cacheflush_64.h +++ b/arch/sparc/include/asm/cacheflush_64.h diff --git a/include/asm-sparc/chafsr.h b/arch/sparc/include/asm/chafsr.h index 85c69b38220b..85c69b38220b 100644 --- a/include/asm-sparc/chafsr.h +++ b/arch/sparc/include/asm/chafsr.h diff --git a/include/asm-sparc/checksum.h b/arch/sparc/include/asm/checksum.h index 4e3553d4f6e1..7ac0d7497bc5 100644 --- a/include/asm-sparc/checksum.h +++ b/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 <asm-sparc/checksum_64.h> +#include <asm/checksum_64.h> #else -#include <asm-sparc/checksum_32.h> +#include <asm/checksum_32.h> #endif #endif diff --git a/include/asm-sparc/checksum_32.h b/arch/sparc/include/asm/checksum_32.h index bdbda1453aa9..bdbda1453aa9 100644 --- a/include/asm-sparc/checksum_32.h +++ b/arch/sparc/include/asm/checksum_32.h diff --git a/include/asm-sparc/checksum_64.h b/arch/sparc/include/asm/checksum_64.h index 019b9615e43c..019b9615e43c 100644 --- a/include/asm-sparc/checksum_64.h +++ b/arch/sparc/include/asm/checksum_64.h diff --git a/include/asm-sparc/chmctrl.h b/arch/sparc/include/asm/chmctrl.h index 859b4a4b0d30..859b4a4b0d30 100644 --- a/include/asm-sparc/chmctrl.h +++ b/arch/sparc/include/asm/chmctrl.h diff --git a/include/asm-sparc/clock.h b/arch/sparc/include/asm/clock.h index 2cf99dadec56..2cf99dadec56 100644 --- a/include/asm-sparc/clock.h +++ b/arch/sparc/include/asm/clock.h diff --git a/include/asm-sparc/cmt.h b/arch/sparc/include/asm/cmt.h index 870db5928577..870db5928577 100644 --- a/include/asm-sparc/cmt.h +++ b/arch/sparc/include/asm/cmt.h diff --git a/include/asm-sparc/compat.h b/arch/sparc/include/asm/compat.h index f260b58f5ce9..f260b58f5ce9 100644 --- a/include/asm-sparc/compat.h +++ b/arch/sparc/include/asm/compat.h diff --git a/include/asm-sparc/compat_signal.h b/arch/sparc/include/asm/compat_signal.h index b759eab9b51c..b759eab9b51c 100644 --- a/include/asm-sparc/compat_signal.h +++ b/arch/sparc/include/asm/compat_signal.h diff --git a/include/asm-sparc/contregs.h b/arch/sparc/include/asm/contregs.h index 48fa8a4ef357..48fa8a4ef357 100644 --- a/include/asm-sparc/contregs.h +++ b/arch/sparc/include/asm/contregs.h diff --git a/include/asm-sparc/cpudata.h b/arch/sparc/include/asm/cpudata.h index b76fac0c8d8f..b5976de7cacd 100644 --- a/include/asm-sparc/cpudata.h +++ b/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 <asm-sparc/cpudata_64.h> +#include <asm/cpudata_64.h> #else -#include <asm-sparc/cpudata_32.h> +#include <asm/cpudata_32.h> #endif #endif diff --git a/include/asm-sparc/cpudata_32.h b/arch/sparc/include/asm/cpudata_32.h index a2c4d51d36c4..31d48a0e32c7 100644 --- a/include/asm-sparc/cpudata_32.h +++ b/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/include/asm-sparc/cpudata_64.h b/arch/sparc/include/asm/cpudata_64.h index 532975ecfe10..532975ecfe10 100644 --- a/include/asm-sparc/cpudata_64.h +++ b/arch/sparc/include/asm/cpudata_64.h diff --git a/include/asm-sparc/cputime.h b/arch/sparc/include/asm/cputime.h index 1a642b81e019..1a642b81e019 100644 --- a/include/asm-sparc/cputime.h +++ b/arch/sparc/include/asm/cputime.h diff --git a/include/asm-sparc/current.h b/arch/sparc/include/asm/current.h index 8a1d9d6643b0..10a0df55a574 100644 --- a/include/asm-sparc/current.h +++ b/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/include/asm-sparc/cypress.h b/arch/sparc/include/asm/cypress.h index 95e9772ea394..95e9772ea394 100644 --- a/include/asm-sparc/cypress.h +++ b/arch/sparc/include/asm/cypress.h diff --git a/include/asm-sparc/dcr.h b/arch/sparc/include/asm/dcr.h index 620c9ba642e9..620c9ba642e9 100644 --- a/include/asm-sparc/dcr.h +++ b/arch/sparc/include/asm/dcr.h diff --git a/include/asm-sparc/dcu.h b/arch/sparc/include/asm/dcu.h index 0f704e106a1b..0f704e106a1b 100644 --- a/include/asm-sparc/dcu.h +++ b/arch/sparc/include/asm/dcu.h diff --git a/include/asm-sparc/delay.h b/arch/sparc/include/asm/delay.h index 6210a3ce9751..467caa2a97a0 100644 --- a/include/asm-sparc/delay.h +++ b/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 <asm-sparc/delay_64.h> +#include <asm/delay_64.h> #else -#include <asm-sparc/delay_32.h> +#include <asm/delay_32.h> #endif #endif diff --git a/include/asm-sparc/delay_32.h b/arch/sparc/include/asm/delay_32.h index bc9aba2bead6..bc9aba2bead6 100644 --- a/include/asm-sparc/delay_32.h +++ b/arch/sparc/include/asm/delay_32.h diff --git a/include/asm-sparc/delay_64.h b/arch/sparc/include/asm/delay_64.h index a77aa622d762..a77aa622d762 100644 --- a/include/asm-sparc/delay_64.h +++ b/arch/sparc/include/asm/delay_64.h diff --git a/include/asm-sparc/device.h b/arch/sparc/include/asm/device.h index 19790eb99cc6..19790eb99cc6 100644 --- a/include/asm-sparc/device.h +++ b/arch/sparc/include/asm/device.h diff --git a/include/asm-sparc/display7seg.h b/arch/sparc/include/asm/display7seg.h index 86d4a901df24..86d4a901df24 100644 --- a/include/asm-sparc/display7seg.h +++ b/arch/sparc/include/asm/display7seg.h diff --git a/include/asm-sparc/div64.h b/arch/sparc/include/asm/div64.h index 6cd978cefb28..6cd978cefb28 100644 --- a/include/asm-sparc/div64.h +++ b/arch/sparc/include/asm/div64.h diff --git a/include/asm-sparc/dma-mapping.h b/arch/sparc/include/asm/dma-mapping.h index 7483504259ce..0f4150e26619 100644 --- a/include/asm-sparc/dma-mapping.h +++ b/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 <asm-sparc/dma-mapping_64.h> +#include <asm/dma-mapping_64.h> #else -#include <asm-sparc/dma-mapping_32.h> +#include <asm/dma-mapping_32.h> #endif #endif diff --git a/include/asm-sparc/dma-mapping_32.h b/arch/sparc/include/asm/dma-mapping_32.h index f3a641e6b2c8..f3a641e6b2c8 100644 --- a/include/asm-sparc/dma-mapping_32.h +++ b/arch/sparc/include/asm/dma-mapping_32.h diff --git a/include/asm-sparc/dma-mapping_64.h b/arch/sparc/include/asm/dma-mapping_64.h index bfa64f9702d5..bfa64f9702d5 100644 --- a/include/asm-sparc/dma-mapping_64.h +++ b/arch/sparc/include/asm/dma-mapping_64.h diff --git a/include/asm-sparc/dma.h b/arch/sparc/include/asm/dma.h index 8cc69bfaae2a..aa1d90ac04c5 100644 --- a/include/asm-sparc/dma.h +++ b/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 <asm-sparc/dma_64.h> +#include <asm/dma_64.h> #else -#include <asm-sparc/dma_32.h> +#include <asm/dma_32.h> #endif #endif diff --git a/include/asm-sparc/dma_32.h b/arch/sparc/include/asm/dma_32.h index 959d6c8a71ae..cf7189c0079b 100644 --- a/include/asm-sparc/dma_32.h +++ b/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/include/asm-sparc/dma_64.h b/arch/sparc/include/asm/dma_64.h index 9d4c024bd3b3..46a8aecffc02 100644 --- a/include/asm-sparc/dma_64.h +++ b/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/include/asm-sparc/ebus.h b/arch/sparc/include/asm/ebus.h index a5da2d00cd18..83a6d16c22e6 100644 --- a/include/asm-sparc/ebus.h +++ b/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 <asm-sparc/ebus_64.h> +#include <asm/ebus_64.h> #else -#include <asm-sparc/ebus_32.h> +#include <asm/ebus_32.h> #endif #endif diff --git a/include/asm-sparc/ebus_32.h b/arch/sparc/include/asm/ebus_32.h index 29cb7dfc6b79..29cb7dfc6b79 100644 --- a/include/asm-sparc/ebus_32.h +++ b/arch/sparc/include/asm/ebus_32.h diff --git a/include/asm-sparc/ebus_64.h b/arch/sparc/include/asm/ebus_64.h index fcc62b97ced5..fcc62b97ced5 100644 --- a/include/asm-sparc/ebus_64.h +++ b/arch/sparc/include/asm/ebus_64.h diff --git a/include/asm-sparc/ecc.h b/arch/sparc/include/asm/ecc.h index ccb84b66fef1..ccb84b66fef1 100644 --- a/include/asm-sparc/ecc.h +++ b/arch/sparc/include/asm/ecc.h diff --git a/include/asm-sparc/eeprom.h b/arch/sparc/include/asm/eeprom.h index e17beeceb405..e17beeceb405 100644 --- a/include/asm-sparc/eeprom.h +++ b/arch/sparc/include/asm/eeprom.h diff --git a/include/asm-sparc/elf.h b/arch/sparc/include/asm/elf.h index f035c45d7b5e..0a2816c50b07 100644 --- a/include/asm-sparc/elf.h +++ b/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 <asm-sparc/elf_64.h> +#include <asm/elf_64.h> #else -#include <asm-sparc/elf_32.h> +#include <asm/elf_32.h> #endif #endif diff --git a/include/asm-sparc/elf_32.h b/arch/sparc/include/asm/elf_32.h index d043f80bc2fd..d043f80bc2fd 100644 --- a/include/asm-sparc/elf_32.h +++ b/arch/sparc/include/asm/elf_32.h diff --git a/include/asm-sparc/elf_64.h b/arch/sparc/include/asm/elf_64.h index 0818a1308f4e..0818a1308f4e 100644 --- a/include/asm-sparc/elf_64.h +++ b/arch/sparc/include/asm/elf_64.h diff --git a/include/asm-sparc/emergency-restart.h b/arch/sparc/include/asm/emergency-restart.h index 108d8c48e42e..108d8c48e42e 100644 --- a/include/asm-sparc/emergency-restart.h +++ b/arch/sparc/include/asm/emergency-restart.h diff --git a/include/asm-sparc/envctrl.h b/arch/sparc/include/asm/envctrl.h index 624fa7e2da8e..624fa7e2da8e 100644 --- a/include/asm-sparc/envctrl.h +++ b/arch/sparc/include/asm/envctrl.h diff --git a/include/asm-sparc/errno.h b/arch/sparc/include/asm/errno.h index a9ef172977de..a9ef172977de 100644 --- a/include/asm-sparc/errno.h +++ b/arch/sparc/include/asm/errno.h diff --git a/include/asm-sparc/estate.h b/arch/sparc/include/asm/estate.h index 520c08560d1b..520c08560d1b 100644 --- a/include/asm-sparc/estate.h +++ b/arch/sparc/include/asm/estate.h diff --git a/include/asm-sparc/fb.h b/arch/sparc/include/asm/fb.h index b83e44729655..b83e44729655 100644 --- a/include/asm-sparc/fb.h +++ b/arch/sparc/include/asm/fb.h diff --git a/include/asm-sparc/fbio.h b/arch/sparc/include/asm/fbio.h index b9215a0907d3..b9215a0907d3 100644 --- a/include/asm-sparc/fbio.h +++ b/arch/sparc/include/asm/fbio.h diff --git a/include/asm-sparc/fcntl.h b/arch/sparc/include/asm/fcntl.h index d4d9c9d852c3..d4d9c9d852c3 100644 --- a/include/asm-sparc/fcntl.h +++ b/arch/sparc/include/asm/fcntl.h diff --git a/include/asm-sparc/fhc.h b/arch/sparc/include/asm/fhc.h index 788cbc46a116..788cbc46a116 100644 --- a/include/asm-sparc/fhc.h +++ b/arch/sparc/include/asm/fhc.h diff --git a/include/asm-sparc/fixmap.h b/arch/sparc/include/asm/fixmap.h index f18fc0755adf..f18fc0755adf 100644 --- a/include/asm-sparc/fixmap.h +++ b/arch/sparc/include/asm/fixmap.h diff --git a/include/asm-sparc/floppy.h b/arch/sparc/include/asm/floppy.h index 6c628ba15a8d..faebd335b600 100644 --- a/include/asm-sparc/floppy.h +++ b/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 <asm-sparc/floppy_64.h> +#include <asm/floppy_64.h> #else -#include <asm-sparc/floppy_32.h> +#include <asm/floppy_32.h> #endif #endif diff --git a/include/asm-sparc/floppy_32.h b/arch/sparc/include/asm/floppy_32.h index acdd06eafe59..ae3f00bf22ff 100644 --- a/include/asm-sparc/floppy_32.h +++ b/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/include/asm-sparc/floppy_64.h b/arch/sparc/include/asm/floppy_64.h index c39db1060bc7..c39db1060bc7 100644 --- a/include/asm-sparc/floppy_64.h +++ b/arch/sparc/include/asm/floppy_64.h diff --git a/include/asm-sparc/fpumacro.h b/arch/sparc/include/asm/fpumacro.h index cc463fec806f..cc463fec806f 100644 --- a/include/asm-sparc/fpumacro.h +++ b/arch/sparc/include/asm/fpumacro.h diff --git a/include/asm-sparc64/ftrace.h b/arch/sparc/include/asm/ftrace.h index d27716cd38c1..d27716cd38c1 100644 --- a/include/asm-sparc64/ftrace.h +++ b/arch/sparc/include/asm/ftrace.h diff --git a/include/asm-sparc/futex.h b/arch/sparc/include/asm/futex.h index c6a9f038c531..736335f36713 100644 --- a/include/asm-sparc/futex.h +++ b/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 <asm-sparc/futex_64.h> +#include <asm/futex_64.h> #else -#include <asm-sparc/futex_32.h> +#include <asm/futex_32.h> #endif #endif diff --git a/include/asm-sparc/futex_32.h b/arch/sparc/include/asm/futex_32.h index 6a332a9f099c..6a332a9f099c 100644 --- a/include/asm-sparc/futex_32.h +++ b/arch/sparc/include/asm/futex_32.h diff --git a/include/asm-sparc/futex_64.h b/arch/sparc/include/asm/futex_64.h index d8378935ae90..d8378935ae90 100644 --- a/include/asm-sparc/futex_64.h +++ b/arch/sparc/include/asm/futex_64.h diff --git a/include/asm-sparc/hardirq.h b/arch/sparc/include/asm/hardirq.h index 156478773100..44d4e2345148 100644 --- a/include/asm-sparc/hardirq.h +++ b/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 <asm-sparc/hardirq_64.h> +#include <asm/hardirq_64.h> #else -#include <asm-sparc/hardirq_32.h> +#include <asm/hardirq_32.h> #endif #endif diff --git a/include/asm-sparc/hardirq_32.h b/arch/sparc/include/asm/hardirq_32.h index 4f63ed8df551..4f63ed8df551 100644 --- a/include/asm-sparc/hardirq_32.h +++ b/arch/sparc/include/asm/hardirq_32.h diff --git a/include/asm-sparc/hardirq_64.h b/arch/sparc/include/asm/hardirq_64.h index 7c29fd1a87aa..7c29fd1a87aa 100644 --- a/include/asm-sparc/hardirq_64.h +++ b/arch/sparc/include/asm/hardirq_64.h diff --git a/include/asm-sparc/head.h b/arch/sparc/include/asm/head.h index 14652abdea31..be8f03f3e731 100644 --- a/include/asm-sparc/head.h +++ b/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 <asm-sparc/head_64.h> +#include <asm/head_64.h> #else -#include <asm-sparc/head_32.h> +#include <asm/head_32.h> #endif #endif diff --git a/include/asm-sparc/head_32.h b/arch/sparc/include/asm/head_32.h index 7c35491a8b53..7c35491a8b53 100644 --- a/include/asm-sparc/head_32.h +++ b/arch/sparc/include/asm/head_32.h diff --git a/include/asm-sparc/head_64.h b/arch/sparc/include/asm/head_64.h index 10e9dabc4c41..10e9dabc4c41 100644 --- a/include/asm-sparc/head_64.h +++ b/arch/sparc/include/asm/head_64.h diff --git a/include/asm-sparc/highmem.h b/arch/sparc/include/asm/highmem.h index 3de42e776274..3de42e776274 100644 --- a/include/asm-sparc/highmem.h +++ b/arch/sparc/include/asm/highmem.h diff --git a/include/asm-sparc/hugetlb.h b/arch/sparc/include/asm/hugetlb.h index 177061064ee6..177061064ee6 100644 --- a/include/asm-sparc/hugetlb.h +++ b/arch/sparc/include/asm/hugetlb.h diff --git a/include/asm-sparc/hvtramp.h b/arch/sparc/include/asm/hvtramp.h index b2b9b947b3a4..b2b9b947b3a4 100644 --- a/include/asm-sparc/hvtramp.h +++ b/arch/sparc/include/asm/hvtramp.h diff --git a/include/asm-sparc/hw_irq.h b/arch/sparc/include/asm/hw_irq.h index 8d30a7694be2..8d30a7694be2 100644 --- a/include/asm-sparc/hw_irq.h +++ b/arch/sparc/include/asm/hw_irq.h diff --git a/include/asm-sparc/hypervisor.h b/arch/sparc/include/asm/hypervisor.h index 109ae24ba242..109ae24ba242 100644 --- a/include/asm-sparc/hypervisor.h +++ b/arch/sparc/include/asm/hypervisor.h diff --git a/include/asm-sparc/ide.h b/arch/sparc/include/asm/ide.h index b7af3d658239..b7af3d658239 100644 --- a/include/asm-sparc/ide.h +++ b/arch/sparc/include/asm/ide.h diff --git a/include/asm-sparc/idprom.h b/arch/sparc/include/asm/idprom.h index 6976aa2439c6..6976aa2439c6 100644 --- a/include/asm-sparc/idprom.h +++ b/arch/sparc/include/asm/idprom.h diff --git a/include/asm-sparc/intr_queue.h b/arch/sparc/include/asm/intr_queue.h index 206077dedc2a..206077dedc2a 100644 --- a/include/asm-sparc/intr_queue.h +++ b/arch/sparc/include/asm/intr_queue.h diff --git a/include/asm-sparc/io-unit.h b/arch/sparc/include/asm/io-unit.h index 96823b47fd45..96823b47fd45 100644 --- a/include/asm-sparc/io-unit.h +++ b/arch/sparc/include/asm/io-unit.h diff --git a/include/asm-sparc/io.h b/arch/sparc/include/asm/io.h index fc9024d3dfc3..a34b2994937a 100644 --- a/include/asm-sparc/io.h +++ b/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 <asm-sparc/io_64.h> +#include <asm/io_64.h> #else -#include <asm-sparc/io_32.h> +#include <asm/io_32.h> #endif #endif diff --git a/include/asm-sparc/io_32.h b/arch/sparc/include/asm/io_32.h index 10d7da450070..10d7da450070 100644 --- a/include/asm-sparc/io_32.h +++ b/arch/sparc/include/asm/io_32.h diff --git a/include/asm-sparc/io_64.h b/arch/sparc/include/asm/io_64.h index 0bff078ffdd0..0bff078ffdd0 100644 --- a/include/asm-sparc/io_64.h +++ b/arch/sparc/include/asm/io_64.h diff --git a/include/asm-sparc/ioctl.h b/arch/sparc/include/asm/ioctl.h index 7d6bd51321b9..7d6bd51321b9 100644 --- a/include/asm-sparc/ioctl.h +++ b/arch/sparc/include/asm/ioctl.h diff --git a/include/asm-sparc/ioctls.h b/arch/sparc/include/asm/ioctls.h index 1fe6855c5c18..1fe6855c5c18 100644 --- a/include/asm-sparc/ioctls.h +++ b/arch/sparc/include/asm/ioctls.h diff --git a/include/asm-sparc/iommu.h b/arch/sparc/include/asm/iommu.h index 91b072b0d7a0..e650965b4a8d 100644 --- a/include/asm-sparc/iommu.h +++ b/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 <asm-sparc/iommu_64.h> +#include <asm/iommu_64.h> #else -#include <asm-sparc/iommu_32.h> +#include <asm/iommu_32.h> #endif #endif diff --git a/include/asm-sparc/iommu_32.h b/arch/sparc/include/asm/iommu_32.h index 70c589c05a10..70c589c05a10 100644 --- a/include/asm-sparc/iommu_32.h +++ b/arch/sparc/include/asm/iommu_32.h diff --git a/include/asm-sparc/iommu_64.h b/arch/sparc/include/asm/iommu_64.h index d7b9afcba08b..d7b9afcba08b 100644 --- a/include/asm-sparc/iommu_64.h +++ b/arch/sparc/include/asm/iommu_64.h diff --git a/include/asm-sparc/ipcbuf.h b/arch/sparc/include/asm/ipcbuf.h index 037605d986e2..17d6ef7b23a4 100644 --- a/include/asm-sparc/ipcbuf.h +++ b/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 <asm-sparc/ipcbuf_64.h> +#include <asm/ipcbuf_64.h> #else -#include <asm-sparc/ipcbuf_32.h> +#include <asm/ipcbuf_32.h> #endif #endif diff --git a/include/asm-sparc/ipcbuf_32.h b/arch/sparc/include/asm/ipcbuf_32.h index 6387209518f2..6387209518f2 100644 --- a/include/asm-sparc/ipcbuf_32.h +++ b/arch/sparc/include/asm/ipcbuf_32.h diff --git a/include/asm-sparc/ipcbuf_64.h b/arch/sparc/include/asm/ipcbuf_64.h index a44b855b98db..a44b855b98db 100644 --- a/include/asm-sparc/ipcbuf_64.h +++ b/arch/sparc/include/asm/ipcbuf_64.h diff --git a/include/asm-sparc/irq.h b/arch/sparc/include/asm/irq.h index 7af6bb4aa09c..3b44a6a14074 100644 --- a/include/asm-sparc/irq.h +++ b/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 <asm-sparc/irq_64.h> +#include <asm/irq_64.h> #else -#include <asm-sparc/irq_32.h> +#include <asm/irq_32.h> #endif #endif diff --git a/include/asm-sparc/irq_32.h b/arch/sparc/include/asm/irq_32.h index fe205cc444b8..fe205cc444b8 100644 --- a/include/asm-sparc/irq_32.h +++ b/arch/sparc/include/asm/irq_32.h diff --git a/include/asm-sparc/irq_64.h b/arch/sparc/include/asm/irq_64.h index 0bb9bf531745..0bb9bf531745 100644 --- a/include/asm-sparc/irq_64.h +++ b/arch/sparc/include/asm/irq_64.h diff --git a/include/asm-sparc/irq_regs.h b/arch/sparc/include/asm/irq_regs.h index 3dd9c0b70270..3dd9c0b70270 100644 --- a/include/asm-sparc/irq_regs.h +++ b/arch/sparc/include/asm/irq_regs.h diff --git a/include/asm-sparc/irqflags.h b/arch/sparc/include/asm/irqflags.h index c6402b187e23..1e138632bd3f 100644 --- a/include/asm-sparc/irqflags.h +++ b/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 <asm-sparc/irqflags_64.h> +#include <asm/irqflags_64.h> #else -#include <asm-sparc/irqflags_32.h> +#include <asm/irqflags_32.h> #endif #endif diff --git a/include/asm-sparc/irqflags_32.h b/arch/sparc/include/asm/irqflags_32.h index db398fb32826..0fca9d97d44f 100644 --- a/include/asm-sparc/irqflags_32.h +++ b/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/include/asm-sparc/irqflags_64.h b/arch/sparc/include/asm/irqflags_64.h index 024fc54d0682..bb42e59162aa 100644 --- a/include/asm-sparc/irqflags_64.h +++ b/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/include/asm-sparc/jsflash.h b/arch/sparc/include/asm/jsflash.h index 3457f29bd73b..3457f29bd73b 100644 --- a/include/asm-sparc/jsflash.h +++ b/arch/sparc/include/asm/jsflash.h diff --git a/include/asm-sparc/kdebug.h b/arch/sparc/include/asm/kdebug.h index fe07d00d0534..8d12581ca386 100644 --- a/include/asm-sparc/kdebug.h +++ b/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 <asm-sparc/kdebug_64.h> +#include <asm/kdebug_64.h> #else -#include <asm-sparc/kdebug_32.h> +#include <asm/kdebug_32.h> #endif #endif diff --git a/include/asm-sparc/kdebug_32.h b/arch/sparc/include/asm/kdebug_32.h index f69fe7d84b3c..f69fe7d84b3c 100644 --- a/include/asm-sparc/kdebug_32.h +++ b/arch/sparc/include/asm/kdebug_32.h diff --git a/include/asm-sparc/kdebug_64.h b/arch/sparc/include/asm/kdebug_64.h index f905b773235a..f905b773235a 100644 --- a/include/asm-sparc/kdebug_64.h +++ b/arch/sparc/include/asm/kdebug_64.h diff --git a/include/asm-sparc/kgdb.h b/arch/sparc/include/asm/kgdb.h index b6ef301d05bf..b6ef301d05bf 100644 --- a/include/asm-sparc/kgdb.h +++ b/arch/sparc/include/asm/kgdb.h diff --git a/include/asm-sparc/kmap_types.h b/arch/sparc/include/asm/kmap_types.h index 602f5e034f7a..602f5e034f7a 100644 --- a/include/asm-sparc/kmap_types.h +++ b/arch/sparc/include/asm/kmap_types.h diff --git a/include/asm-sparc/kprobes.h b/arch/sparc/include/asm/kprobes.h index 5879d71afdaa..5879d71afdaa 100644 --- a/include/asm-sparc/kprobes.h +++ b/arch/sparc/include/asm/kprobes.h diff --git a/include/asm-sparc/ldc.h b/arch/sparc/include/asm/ldc.h index bdb524a7b814..bdb524a7b814 100644 --- a/include/asm-sparc/ldc.h +++ b/arch/sparc/include/asm/ldc.h diff --git a/include/asm-sparc/linkage.h b/arch/sparc/include/asm/linkage.h index 291c2d01c44f..291c2d01c44f 100644 --- a/include/asm-sparc/linkage.h +++ b/arch/sparc/include/asm/linkage.h diff --git a/include/asm-sparc/lmb.h b/arch/sparc/include/asm/lmb.h index 6a352cbcf520..6a352cbcf520 100644 --- a/include/asm-sparc/lmb.h +++ b/arch/sparc/include/asm/lmb.h diff --git a/include/asm-sparc/local.h b/arch/sparc/include/asm/local.h index bc80815a435c..bc80815a435c 100644 --- a/include/asm-sparc/local.h +++ b/arch/sparc/include/asm/local.h diff --git a/include/asm-sparc/lsu.h b/arch/sparc/include/asm/lsu.h index 7190f8de90a0..7190f8de90a0 100644 --- a/include/asm-sparc/lsu.h +++ b/arch/sparc/include/asm/lsu.h diff --git a/include/asm-sparc/machines.h b/arch/sparc/include/asm/machines.h index c28c2f248794..c28c2f248794 100644 --- a/include/asm-sparc/machines.h +++ b/arch/sparc/include/asm/machines.h diff --git a/include/asm-sparc/mbus.h b/arch/sparc/include/asm/mbus.h index 69f07a022ee6..69f07a022ee6 100644 --- a/include/asm-sparc/mbus.h +++ b/arch/sparc/include/asm/mbus.h diff --git a/include/asm-sparc/mc146818rtc.h b/arch/sparc/include/asm/mc146818rtc.h index 9ab65c21e9e4..67ed9e3a0235 100644 --- a/include/asm-sparc/mc146818rtc.h +++ b/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 <asm-sparc/mc146818rtc_64.h> +#include <asm/mc146818rtc_64.h> #else -#include <asm-sparc/mc146818rtc_32.h> +#include <asm/mc146818rtc_32.h> #endif #endif diff --git a/include/asm-sparc/mc146818rtc_32.h b/arch/sparc/include/asm/mc146818rtc_32.h index fa7eac926582..fa7eac926582 100644 --- a/include/asm-sparc/mc146818rtc_32.h +++ b/arch/sparc/include/asm/mc146818rtc_32.h diff --git a/include/asm-sparc/mc146818rtc_64.h b/arch/sparc/include/asm/mc146818rtc_64.h index e9c0fcc25c6f..e9c0fcc25c6f 100644 --- a/include/asm-sparc/mc146818rtc_64.h +++ b/arch/sparc/include/asm/mc146818rtc_64.h diff --git a/include/asm-sparc/mdesc.h b/arch/sparc/include/asm/mdesc.h index 1acc7272e537..1acc7272e537 100644 --- a/include/asm-sparc/mdesc.h +++ b/arch/sparc/include/asm/mdesc.h diff --git a/include/asm-sparc/memreg.h b/arch/sparc/include/asm/memreg.h index 845ad2b39183..845ad2b39183 100644 --- a/include/asm-sparc/memreg.h +++ b/arch/sparc/include/asm/memreg.h diff --git a/include/asm-sparc/mman.h b/arch/sparc/include/asm/mman.h index fdfbbf0a4736..fdfbbf0a4736 100644 --- a/include/asm-sparc/mman.h +++ b/arch/sparc/include/asm/mman.h diff --git a/include/asm-sparc/mmu.h b/arch/sparc/include/asm/mmu.h index ee66bf6dcbd6..88fa313887db 100644 --- a/include/asm-sparc/mmu.h +++ b/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 <asm-sparc/mmu_64.h> +#include <asm/mmu_64.h> #else -#include <asm-sparc/mmu_32.h> +#include <asm/mmu_32.h> #endif #endif diff --git a/include/asm-sparc/mmu_32.h b/arch/sparc/include/asm/mmu_32.h index ccd36d26615a..ccd36d26615a 100644 --- a/include/asm-sparc/mmu_32.h +++ b/arch/sparc/include/asm/mmu_32.h diff --git a/include/asm-sparc/mmu_64.h b/arch/sparc/include/asm/mmu_64.h index 9067dc500535..9067dc500535 100644 --- a/include/asm-sparc/mmu_64.h +++ b/arch/sparc/include/asm/mmu_64.h diff --git a/include/asm-sparc/mmu_context.h b/arch/sparc/include/asm/mmu_context.h index e14efb9532ff..5531346c64f9 100644 --- a/include/asm-sparc/mmu_context.h +++ b/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 <asm-sparc/mmu_context_64.h> +#include <asm/mmu_context_64.h> #else -#include <asm-sparc/mmu_context_32.h> +#include <asm/mmu_context_32.h> #endif #endif diff --git a/include/asm-sparc/mmu_context_32.h b/arch/sparc/include/asm/mmu_context_32.h index 671a997b9e69..671a997b9e69 100644 --- a/include/asm-sparc/mmu_context_32.h +++ b/arch/sparc/include/asm/mmu_context_32.h diff --git a/include/asm-sparc/mmu_context_64.h b/arch/sparc/include/asm/mmu_context_64.h index 5693ab482606..5693ab482606 100644 --- a/include/asm-sparc/mmu_context_64.h +++ b/arch/sparc/include/asm/mmu_context_64.h diff --git a/include/asm-sparc/mmzone.h b/arch/sparc/include/asm/mmzone.h index ebf5986c12ed..ebf5986c12ed 100644 --- a/include/asm-sparc/mmzone.h +++ b/arch/sparc/include/asm/mmzone.h diff --git a/include/asm-sparc/module.h b/arch/sparc/include/asm/module.h index 516138fe681a..e82cf9a3e60e 100644 --- a/include/asm-sparc/module.h +++ b/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 <asm-sparc/module_64.h> +#include <asm/module_64.h> #else -#include <asm-sparc/module_32.h> +#include <asm/module_32.h> #endif #endif diff --git a/include/asm-sparc/module_32.h b/arch/sparc/include/asm/module_32.h index cbd9e67b0c0b..cbd9e67b0c0b 100644 --- a/include/asm-sparc/module_32.h +++ b/arch/sparc/include/asm/module_32.h diff --git a/include/asm-sparc/module_64.h b/arch/sparc/include/asm/module_64.h index 3d77ba465783..3d77ba465783 100644 --- a/include/asm-sparc/module_64.h +++ b/arch/sparc/include/asm/module_64.h diff --git a/include/asm-sparc/mostek.h b/arch/sparc/include/asm/mostek.h index 5b9f7fec7ee7..433be3e0a69b 100644 --- a/include/asm-sparc/mostek.h +++ b/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 <asm-sparc/mostek_64.h> +#include <asm/mostek_64.h> #else -#include <asm-sparc/mostek_32.h> +#include <asm/mostek_32.h> #endif #endif diff --git a/include/asm-sparc/mostek_32.h b/arch/sparc/include/asm/mostek_32.h index a99590c4c507..a99590c4c507 100644 --- a/include/asm-sparc/mostek_32.h +++ b/arch/sparc/include/asm/mostek_32.h diff --git a/include/asm-sparc/mostek_64.h b/arch/sparc/include/asm/mostek_64.h index c5652de2ace2..c5652de2ace2 100644 --- a/include/asm-sparc/mostek_64.h +++ b/arch/sparc/include/asm/mostek_64.h diff --git a/include/asm-sparc/mpmbox.h b/arch/sparc/include/asm/mpmbox.h index f8423039b242..f8423039b242 100644 --- a/include/asm-sparc/mpmbox.h +++ b/arch/sparc/include/asm/mpmbox.h diff --git a/include/asm-sparc/msgbuf.h b/arch/sparc/include/asm/msgbuf.h index efc7cbe9788f..efc7cbe9788f 100644 --- a/include/asm-sparc/msgbuf.h +++ b/arch/sparc/include/asm/msgbuf.h diff --git a/include/asm-sparc/msi.h b/arch/sparc/include/asm/msi.h index 724ca5667052..724ca5667052 100644 --- a/include/asm-sparc/msi.h +++ b/arch/sparc/include/asm/msi.h diff --git a/include/asm-sparc/mutex.h b/arch/sparc/include/asm/mutex.h index 458c1f7fbc18..458c1f7fbc18 100644 --- a/include/asm-sparc/mutex.h +++ b/arch/sparc/include/asm/mutex.h diff --git a/include/asm-sparc/mxcc.h b/arch/sparc/include/asm/mxcc.h index c0517bd05bde..c0517bd05bde 100644 --- a/include/asm-sparc/mxcc.h +++ b/arch/sparc/include/asm/mxcc.h diff --git a/include/asm-sparc/ns87303.h b/arch/sparc/include/asm/ns87303.h index 686defe6aaa0..686defe6aaa0 100644 --- a/include/asm-sparc/ns87303.h +++ b/arch/sparc/include/asm/ns87303.h diff --git a/include/asm-sparc/obio.h b/arch/sparc/include/asm/obio.h index 1a7544ceb574..1a7544ceb574 100644 --- a/include/asm-sparc/obio.h +++ b/arch/sparc/include/asm/obio.h diff --git a/include/asm-sparc/of_device.h b/arch/sparc/include/asm/of_device.h index e5f5aedc2293..e5f5aedc2293 100644 --- a/include/asm-sparc/of_device.h +++ b/arch/sparc/include/asm/of_device.h diff --git a/include/asm-sparc/of_platform.h b/arch/sparc/include/asm/of_platform.h index 851eb84d737e..aa699775ffba 100644 --- a/include/asm-sparc/of_platform.h +++ b/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 <asm-sparc/of_platform_64.h> +#include <asm/of_platform_64.h> #else -#include <asm-sparc/of_platform_32.h> +#include <asm/of_platform_32.h> #endif #endif diff --git a/include/asm-sparc/of_platform_32.h b/arch/sparc/include/asm/of_platform_32.h index 38334351c36b..723f7c9b7411 100644 --- a/include/asm-sparc/of_platform_32.h +++ b/arch/sparc/include/asm/of_platform_32.h @@ -3,7 +3,7 @@ /* * Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp. * <benh@kernel.crashing.org> - * 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/include/asm-sparc/of_platform_64.h b/arch/sparc/include/asm/of_platform_64.h index 78aa032b674c..4f66a5f6342d 100644 --- a/include/asm-sparc/of_platform_64.h +++ b/arch/sparc/include/asm/of_platform_64.h @@ -3,7 +3,7 @@ /* * Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp. * <benh@kernel.crashing.org> - * 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/include/asm-sparc/openprom.h b/arch/sparc/include/asm/openprom.h index 8c349f061994..aaeae905ed3f 100644 --- a/include/asm-sparc/openprom.h +++ b/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 <asm-sparc/openprom_64.h> +#include <asm/openprom_64.h> #else -#include <asm-sparc/openprom_32.h> +#include <asm/openprom_32.h> #endif #endif diff --git a/include/asm-sparc/openprom_32.h b/arch/sparc/include/asm/openprom_32.h index 8b1649f29ed9..8b1649f29ed9 100644 --- a/include/asm-sparc/openprom_32.h +++ b/arch/sparc/include/asm/openprom_32.h diff --git a/include/asm-sparc/openprom_64.h b/arch/sparc/include/asm/openprom_64.h index b69e4a8c9170..b69e4a8c9170 100644 --- a/include/asm-sparc/openprom_64.h +++ b/arch/sparc/include/asm/openprom_64.h diff --git a/include/asm-sparc/openpromio.h b/arch/sparc/include/asm/openpromio.h index 917fb8e9c633..917fb8e9c633 100644 --- a/include/asm-sparc/openpromio.h +++ b/arch/sparc/include/asm/openpromio.h diff --git a/include/asm-sparc/oplib.h b/arch/sparc/include/asm/oplib.h index e88d7c04a292..72e04e13a6b4 100644 --- a/include/asm-sparc/oplib.h +++ b/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 <asm-sparc/oplib_64.h> +#include <asm/oplib_64.h> #else -#include <asm-sparc/oplib_32.h> +#include <asm/oplib_32.h> #endif #endif diff --git a/include/asm-sparc/oplib_32.h b/arch/sparc/include/asm/oplib_32.h index b2631da259e0..b2631da259e0 100644 --- a/include/asm-sparc/oplib_32.h +++ b/arch/sparc/include/asm/oplib_32.h diff --git a/include/asm-sparc/oplib_64.h b/arch/sparc/include/asm/oplib_64.h index 6d2c2ca98039..6d2c2ca98039 100644 --- a/include/asm-sparc/oplib_64.h +++ b/arch/sparc/include/asm/oplib_64.h diff --git a/include/asm-sparc/page.h b/arch/sparc/include/asm/page.h index f32f49fcf75c..f21de0349025 100644 --- a/include/asm-sparc/page.h +++ b/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 <asm-sparc/page_64.h> +#include <asm/page_64.h> #else -#include <asm-sparc/page_32.h> +#include <asm/page_32.h> #endif #endif diff --git a/include/asm-sparc/page_32.h b/arch/sparc/include/asm/page_32.h index cf5fb70ca1c1..cf5fb70ca1c1 100644 --- a/include/asm-sparc/page_32.h +++ b/arch/sparc/include/asm/page_32.h diff --git a/include/asm-sparc/page_64.h b/arch/sparc/include/asm/page_64.h index b579b910ef51..b579b910ef51 100644 --- a/include/asm-sparc/page_64.h +++ b/arch/sparc/include/asm/page_64.h diff --git a/include/asm-sparc/param.h b/arch/sparc/include/asm/param.h index 9836d9a3cb9a..9836d9a3cb9a 100644 --- a/include/asm-sparc/param.h +++ b/arch/sparc/include/asm/param.h diff --git a/include/asm-sparc/parport.h b/arch/sparc/include/asm/parport.h index 7818b2523b8d..7818b2523b8d 100644 --- a/include/asm-sparc/parport.h +++ b/arch/sparc/include/asm/parport.h diff --git a/include/asm-sparc/pbm.h b/arch/sparc/include/asm/pbm.h index 458a4916d14d..458a4916d14d 100644 --- a/include/asm-sparc/pbm.h +++ b/arch/sparc/include/asm/pbm.h diff --git a/include/asm-sparc/pci.h b/arch/sparc/include/asm/pci.h index b807d52a4809..6e14fd179335 100644 --- a/include/asm-sparc/pci.h +++ b/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 <asm-sparc/pci_64.h> +#include <asm/pci_64.h> #else -#include <asm-sparc/pci_32.h> +#include <asm/pci_32.h> #endif #endif diff --git a/include/asm-sparc/pci_32.h b/arch/sparc/include/asm/pci_32.h index 0ee949d220c0..0ee949d220c0 100644 --- a/include/asm-sparc/pci_32.h +++ b/arch/sparc/include/asm/pci_32.h diff --git a/include/asm-sparc/pci_64.h b/arch/sparc/include/asm/pci_64.h index 4f79a54948f6..4f79a54948f6 100644 --- a/include/asm-sparc/pci_64.h +++ b/arch/sparc/include/asm/pci_64.h diff --git a/include/asm-sparc/pcic.h b/arch/sparc/include/asm/pcic.h index f20ef562b265..f20ef562b265 100644 --- a/include/asm-sparc/pcic.h +++ b/arch/sparc/include/asm/pcic.h diff --git a/include/asm-sparc/percpu.h b/arch/sparc/include/asm/percpu.h index d98ed6cf2e36..bfb1d19ff1bf 100644 --- a/include/asm-sparc/percpu.h +++ b/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 <asm-sparc/percpu_64.h> +#include <asm/percpu_64.h> #else -#include <asm-sparc/percpu_32.h> +#include <asm/percpu_32.h> #endif #endif diff --git a/include/asm-sparc/percpu_32.h b/arch/sparc/include/asm/percpu_32.h index 06066a7aaec3..06066a7aaec3 100644 --- a/include/asm-sparc/percpu_32.h +++ b/arch/sparc/include/asm/percpu_32.h diff --git a/include/asm-sparc/percpu_64.h b/arch/sparc/include/asm/percpu_64.h index bee64593023e..bee64593023e 100644 --- a/include/asm-sparc/percpu_64.h +++ b/arch/sparc/include/asm/percpu_64.h diff --git a/include/asm-sparc/perfctr.h b/arch/sparc/include/asm/perfctr.h index 836873002b75..836873002b75 100644 --- a/include/asm-sparc/perfctr.h +++ b/arch/sparc/include/asm/perfctr.h diff --git a/include/asm-sparc/pgalloc.h b/arch/sparc/include/asm/pgalloc.h index 7fa02b53d392..b6db1f7cdcab 100644 --- a/include/asm-sparc/pgalloc.h +++ b/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 <asm-sparc/pgalloc_64.h> +#include <asm/pgalloc_64.h> #else -#include <asm-sparc/pgalloc_32.h> +#include <asm/pgalloc_32.h> #endif #endif diff --git a/include/asm-sparc/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h index 681582d26969..681582d26969 100644 --- a/include/asm-sparc/pgalloc_32.h +++ b/arch/sparc/include/asm/pgalloc_32.h diff --git a/include/asm-sparc/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h index 5bdfa2c6e400..5bdfa2c6e400 100644 --- a/include/asm-sparc/pgalloc_64.h +++ b/arch/sparc/include/asm/pgalloc_64.h diff --git a/include/asm-sparc/pgtable.h b/arch/sparc/include/asm/pgtable.h index 63cdef53bc52..59ba6f620732 100644 --- a/include/asm-sparc/pgtable.h +++ b/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 <asm-sparc/pgtable_64.h> +#include <asm/pgtable_64.h> #else -#include <asm-sparc/pgtable_32.h> +#include <asm/pgtable_32.h> #endif #endif diff --git a/include/asm-sparc/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h index 781bd4694a1c..08237fda8874 100644 --- a/include/asm-sparc/pgtable_32.h +++ b/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/include/asm-sparc/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h index bb9ec2cce355..bb9ec2cce355 100644 --- a/include/asm-sparc/pgtable_64.h +++ b/arch/sparc/include/asm/pgtable_64.h diff --git a/include/asm-sparc/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h index 808555fc1d58..808555fc1d58 100644 --- a/include/asm-sparc/pgtsrmmu.h +++ b/arch/sparc/include/asm/pgtsrmmu.h diff --git a/include/asm-sparc/pgtsun4.h b/arch/sparc/include/asm/pgtsun4.h index 5a0d661fb82e..5a0d661fb82e 100644 --- a/include/asm-sparc/pgtsun4.h +++ b/arch/sparc/include/asm/pgtsun4.h diff --git a/include/asm-sparc/pgtsun4c.h b/arch/sparc/include/asm/pgtsun4c.h index aeb25e912179..aeb25e912179 100644 --- a/include/asm-sparc/pgtsun4c.h +++ b/arch/sparc/include/asm/pgtsun4c.h diff --git a/include/asm-sparc/pil.h b/arch/sparc/include/asm/pil.h index 71819bb943fc..71819bb943fc 100644 --- a/include/asm-sparc/pil.h +++ b/arch/sparc/include/asm/pil.h diff --git a/include/asm-sparc/poll.h b/arch/sparc/include/asm/poll.h index 091d3ad2e830..091d3ad2e830 100644 --- a/include/asm-sparc/poll.h +++ b/arch/sparc/include/asm/poll.h diff --git a/include/asm-sparc/posix_types.h b/arch/sparc/include/asm/posix_types.h index 58c820d75e83..03a0e091a884 100644 --- a/include/asm-sparc/posix_types.h +++ b/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 <asm-sparc/posix_types_64.h> +#include <asm/posix_types_64.h> #else -#include <asm-sparc/posix_types_32.h> +#include <asm/posix_types_32.h> #endif #endif diff --git a/include/asm-sparc/posix_types_32.h b/arch/sparc/include/asm/posix_types_32.h index 6bb6eb1ca0f2..6bb6eb1ca0f2 100644 --- a/include/asm-sparc/posix_types_32.h +++ b/arch/sparc/include/asm/posix_types_32.h diff --git a/include/asm-sparc/posix_types_64.h b/arch/sparc/include/asm/posix_types_64.h index ba8f93295763..ba8f93295763 100644 --- a/include/asm-sparc/posix_types_64.h +++ b/arch/sparc/include/asm/posix_types_64.h diff --git a/include/asm-sparc/processor.h b/arch/sparc/include/asm/processor.h index 11a66bb02eaa..9da9646bf6c6 100644 --- a/include/asm-sparc/processor.h +++ b/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 <asm-sparc/processor_64.h> +#include <asm/processor_64.h> #else -#include <asm-sparc/processor_32.h> +#include <asm/processor_32.h> #endif #endif diff --git a/include/asm-sparc/processor_32.h b/arch/sparc/include/asm/processor_32.h index 562c0d69c537..2ae67a2e7f3a 100644 --- a/include/asm-sparc/processor_32.h +++ b/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) */ @@ -114,6 +114,7 @@ extern pid_t kernel_thread(int (*fn)(void *), void * arg, unsigned long flags); extern unsigned long get_wchan(struct task_struct *); +#define task_pt_regs(tsk) ((tsk)->thread.kregs) #define KSTK_EIP(tsk) ((tsk)->thread.kregs->pc) #define KSTK_ESP(tsk) ((tsk)->thread.kregs->u_regs[UREG_FP]) diff --git a/include/asm-sparc/processor_64.h b/arch/sparc/include/asm/processor_64.h index 70d42801a0d2..137a6bd72fc8 100644 --- a/include/asm-sparc/processor_64.h +++ b/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/include/asm-sparc/prom.h b/arch/sparc/include/asm/prom.h index fd55522481cd..fd55522481cd 100644 --- a/include/asm-sparc/prom.h +++ b/arch/sparc/include/asm/prom.h diff --git a/include/asm-sparc/psr.h b/arch/sparc/include/asm/psr.h index b8c0e5f0a66b..b8c0e5f0a66b 100644 --- a/include/asm-sparc/psr.h +++ b/arch/sparc/include/asm/psr.h diff --git a/include/asm-sparc/psrcompat.h b/arch/sparc/include/asm/psrcompat.h index 44b6327dbbf5..44b6327dbbf5 100644 --- a/include/asm-sparc/psrcompat.h +++ b/arch/sparc/include/asm/psrcompat.h diff --git a/include/asm-sparc/pstate.h b/arch/sparc/include/asm/pstate.h index a26a53777bb0..a26a53777bb0 100644 --- a/include/asm-sparc/pstate.h +++ b/arch/sparc/include/asm/pstate.h diff --git a/include/asm-sparc/ptrace.h b/arch/sparc/include/asm/ptrace.h index f36ab6c30ff3..6dcbe2eed2e2 100644 --- a/include/asm-sparc/ptrace.h +++ b/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 <asm-sparc/ptrace_64.h> +#include <asm/ptrace_64.h> #else -#include <asm-sparc/ptrace_32.h> +#include <asm/ptrace_32.h> #endif #endif diff --git a/include/asm-sparc/ptrace_32.h b/arch/sparc/include/asm/ptrace_32.h index 0401cc7ec38e..d43c88b86834 100644 --- a/include/asm-sparc/ptrace_32.h +++ b/arch/sparc/include/asm/ptrace_32.h @@ -74,6 +74,7 @@ struct sparc_stackf { #define user_mode(regs) (!((regs)->psr & PSR_PS)) #define instruction_pointer(regs) ((regs)->pc) +#define user_stack_pointer(regs) ((regs)->u_regs[UREG_FP]) unsigned long profile_pc(struct pt_regs *); extern void show_regs(struct pt_regs *); #endif diff --git a/include/asm-sparc/ptrace_64.h b/arch/sparc/include/asm/ptrace_64.h index a682e66d5c4a..ec6d45c84cd0 100644 --- a/include/asm-sparc/ptrace_64.h +++ b/arch/sparc/include/asm/ptrace_64.h @@ -146,6 +146,7 @@ do { current_thread_info()->syscall_noerror = 1; \ } while (0) #define user_mode(regs) (!((regs)->tstate & TSTATE_PRIV)) #define instruction_pointer(regs) ((regs)->tpc) +#define user_stack_pointer(regs) ((regs)->u_regs[UREG_FP]) #define regs_return_value(regs) ((regs)->u_regs[UREG_I0]) #ifdef CONFIG_SMP extern unsigned long profile_pc(struct pt_regs *); diff --git a/include/asm-sparc/reboot.h b/arch/sparc/include/asm/reboot.h index 3f3f43f5be5e..3f3f43f5be5e 100644 --- a/include/asm-sparc/reboot.h +++ b/arch/sparc/include/asm/reboot.h diff --git a/include/asm-sparc/reg.h b/arch/sparc/include/asm/reg.h index cb34b0a49aad..0c16e19cae4d 100644 --- a/include/asm-sparc/reg.h +++ b/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 <asm-sparc/reg_64.h> +#include <asm/reg_64.h> #else -#include <asm-sparc/reg_32.h> +#include <asm/reg_32.h> #endif #endif diff --git a/include/asm-sparc/reg_32.h b/arch/sparc/include/asm/reg_32.h index 42fecfcd97e7..1efb056fb3d1 100644 --- a/include/asm-sparc/reg_32.h +++ b/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/include/asm-sparc/reg_64.h b/arch/sparc/include/asm/reg_64.h index eb24a07ff4d5..6f277d7c7d88 100644 --- a/include/asm-sparc/reg_64.h +++ b/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/include/asm-sparc/resource.h b/arch/sparc/include/asm/resource.h index fe163cafb4c7..fe163cafb4c7 100644 --- a/include/asm-sparc/resource.h +++ b/arch/sparc/include/asm/resource.h diff --git a/include/asm-sparc/ross.h b/arch/sparc/include/asm/ross.h index ecb6e81786a6..ecb6e81786a6 100644 --- a/include/asm-sparc/ross.h +++ b/arch/sparc/include/asm/ross.h diff --git a/include/asm-sparc/rtc.h b/arch/sparc/include/asm/rtc.h index f9ecb1fe2ecd..f9ecb1fe2ecd 100644 --- a/include/asm-sparc/rtc.h +++ b/arch/sparc/include/asm/rtc.h diff --git a/include/asm-sparc/rwsem-const.h b/arch/sparc/include/asm/rwsem-const.h index a303c9d64d84..a303c9d64d84 100644 --- a/include/asm-sparc/rwsem-const.h +++ b/arch/sparc/include/asm/rwsem-const.h diff --git a/include/asm-sparc/rwsem.h b/arch/sparc/include/asm/rwsem.h index 1dc129ac2feb..1dc129ac2feb 100644 --- a/include/asm-sparc/rwsem.h +++ b/arch/sparc/include/asm/rwsem.h diff --git a/include/asm-sparc/sbi.h b/arch/sparc/include/asm/sbi.h index 5eb7f1965d33..5eb7f1965d33 100644 --- a/include/asm-sparc/sbi.h +++ b/arch/sparc/include/asm/sbi.h diff --git a/include/asm-sparc/sbus.h b/arch/sparc/include/asm/sbus.h index 8f29a1979665..f82481ab44db 100644 --- a/include/asm-sparc/sbus.h +++ b/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 <asm-sparc/sbus_64.h> +#include <asm/sbus_64.h> #else -#include <asm-sparc/sbus_32.h> +#include <asm/sbus_32.h> #endif #endif diff --git a/include/asm-sparc/sbus_32.h b/arch/sparc/include/asm/sbus_32.h index 77b5d3aadc99..77b5d3aadc99 100644 --- a/include/asm-sparc/sbus_32.h +++ b/arch/sparc/include/asm/sbus_32.h diff --git a/include/asm-sparc/sbus_64.h b/arch/sparc/include/asm/sbus_64.h index 0e16b6dd7e96..0e16b6dd7e96 100644 --- a/include/asm-sparc/sbus_64.h +++ b/arch/sparc/include/asm/sbus_64.h diff --git a/include/asm-sparc/scatterlist.h b/arch/sparc/include/asm/scatterlist.h index b1a0e316c2b6..ec21a4517641 100644 --- a/include/asm-sparc/scatterlist.h +++ b/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 <asm-sparc/scatterlist_64.h> +#include <asm/scatterlist_64.h> #else -#include <asm-sparc/scatterlist_32.h> +#include <asm/scatterlist_32.h> #endif #endif diff --git a/include/asm-sparc/scatterlist_32.h b/arch/sparc/include/asm/scatterlist_32.h index c82609ca1d0f..c82609ca1d0f 100644 --- a/include/asm-sparc/scatterlist_32.h +++ b/arch/sparc/include/asm/scatterlist_32.h diff --git a/include/asm-sparc/scatterlist_64.h b/arch/sparc/include/asm/scatterlist_64.h index 81bd058f9382..81bd058f9382 100644 --- a/include/asm-sparc/scatterlist_64.h +++ b/arch/sparc/include/asm/scatterlist_64.h diff --git a/include/asm-sparc/scratchpad.h b/arch/sparc/include/asm/scratchpad.h index 5e8b01fb3343..5e8b01fb3343 100644 --- a/include/asm-sparc/scratchpad.h +++ b/arch/sparc/include/asm/scratchpad.h diff --git a/include/asm-sparc/seccomp.h b/arch/sparc/include/asm/seccomp.h index 7fcd9968192b..7fcd9968192b 100644 --- a/include/asm-sparc/seccomp.h +++ b/arch/sparc/include/asm/seccomp.h diff --git a/include/asm-sparc/sections.h b/arch/sparc/include/asm/sections.h index cbd019162425..c7c69b00967f 100644 --- a/include/asm-sparc/sections.h +++ b/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 <asm-sparc/sections_64.h> +#include <asm/sections_64.h> #else -#include <asm-sparc/sections_32.h> +#include <asm/sections_32.h> #endif #endif diff --git a/include/asm-sparc/sections_32.h b/arch/sparc/include/asm/sections_32.h index 6832841df051..6832841df051 100644 --- a/include/asm-sparc/sections_32.h +++ b/arch/sparc/include/asm/sections_32.h diff --git a/include/asm-sparc/sections_64.h b/arch/sparc/include/asm/sections_64.h index 3f4b9fdc28d0..3f4b9fdc28d0 100644 --- a/include/asm-sparc/sections_64.h +++ b/arch/sparc/include/asm/sections_64.h diff --git a/include/asm-sparc/sembuf.h b/arch/sparc/include/asm/sembuf.h index faee1be08d67..faee1be08d67 100644 --- a/include/asm-sparc/sembuf.h +++ b/arch/sparc/include/asm/sembuf.h diff --git a/include/asm-sparc/setup.h b/arch/sparc/include/asm/setup.h index 2643c62f4ac0..2643c62f4ac0 100644 --- a/include/asm-sparc/setup.h +++ b/arch/sparc/include/asm/setup.h diff --git a/include/asm-sparc/sfafsr.h b/arch/sparc/include/asm/sfafsr.h index e96137b04a4f..e96137b04a4f 100644 --- a/include/asm-sparc/sfafsr.h +++ b/arch/sparc/include/asm/sfafsr.h diff --git a/include/asm-sparc/sfp-machine.h b/arch/sparc/include/asm/sfp-machine.h index c676fcc2dd27..4ebc3823ed4f 100644 --- a/include/asm-sparc/sfp-machine.h +++ b/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 <asm-sparc/sfp-machine_64.h> +#include <asm/sfp-machine_64.h> #else -#include <asm-sparc/sfp-machine_32.h> +#include <asm/sfp-machine_32.h> #endif #endif diff --git a/include/asm-sparc/sfp-machine_32.h b/arch/sparc/include/asm/sfp-machine_32.h index 01d9c3b5a73b..01d9c3b5a73b 100644 --- a/include/asm-sparc/sfp-machine_32.h +++ b/arch/sparc/include/asm/sfp-machine_32.h diff --git a/include/asm-sparc/sfp-machine_64.h b/arch/sparc/include/asm/sfp-machine_64.h index ca913ef40bd5..ca913ef40bd5 100644 --- a/include/asm-sparc/sfp-machine_64.h +++ b/arch/sparc/include/asm/sfp-machine_64.h diff --git a/include/asm-sparc/shmbuf.h b/arch/sparc/include/asm/shmbuf.h index 83a16055363f..83a16055363f 100644 --- a/include/asm-sparc/shmbuf.h +++ b/arch/sparc/include/asm/shmbuf.h diff --git a/include/asm-sparc/shmparam.h b/arch/sparc/include/asm/shmparam.h index 16fda7e9acc8..8bf0cfe0694f 100644 --- a/include/asm-sparc/shmparam.h +++ b/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 <asm-sparc/shmparam_64.h> +#include <asm/shmparam_64.h> #else -#include <asm-sparc/shmparam_32.h> +#include <asm/shmparam_32.h> #endif #endif diff --git a/include/asm-sparc/shmparam_32.h b/arch/sparc/include/asm/shmparam_32.h index 59a1243c12f3..59a1243c12f3 100644 --- a/include/asm-sparc/shmparam_32.h +++ b/arch/sparc/include/asm/shmparam_32.h diff --git a/include/asm-sparc/shmparam_64.h b/arch/sparc/include/asm/shmparam_64.h index 1ed0d6701a9b..1ed0d6701a9b 100644 --- a/include/asm-sparc/shmparam_64.h +++ b/arch/sparc/include/asm/shmparam_64.h diff --git a/include/asm-sparc/sigcontext.h b/arch/sparc/include/asm/sigcontext.h index 82fc7d54a4fa..e92de7e286b5 100644 --- a/include/asm-sparc/sigcontext.h +++ b/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 <asm-sparc/sigcontext_64.h> +#include <asm/sigcontext_64.h> #else -#include <asm-sparc/sigcontext_32.h> +#include <asm/sigcontext_32.h> #endif #endif diff --git a/include/asm-sparc/sigcontext_32.h b/arch/sparc/include/asm/sigcontext_32.h index c5fb60dcbd75..c5fb60dcbd75 100644 --- a/include/asm-sparc/sigcontext_32.h +++ b/arch/sparc/include/asm/sigcontext_32.h diff --git a/include/asm-sparc/sigcontext_64.h b/arch/sparc/include/asm/sigcontext_64.h index 1c868d680cfc..1c868d680cfc 100644 --- a/include/asm-sparc/sigcontext_64.h +++ b/arch/sparc/include/asm/sigcontext_64.h diff --git a/include/asm-sparc/siginfo.h b/arch/sparc/include/asm/siginfo.h index 2c9fccf4ce18..bd81f8d7f5ce 100644 --- a/include/asm-sparc/siginfo.h +++ b/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 <asm-sparc/siginfo_64.h> +#include <asm/siginfo_64.h> #else -#include <asm-sparc/siginfo_32.h> +#include <asm/siginfo_32.h> #endif #endif diff --git a/include/asm-sparc/siginfo_32.h b/arch/sparc/include/asm/siginfo_32.h index 3c71af135c52..3c71af135c52 100644 --- a/include/asm-sparc/siginfo_32.h +++ b/arch/sparc/include/asm/siginfo_32.h diff --git a/include/asm-sparc/siginfo_64.h b/arch/sparc/include/asm/siginfo_64.h index c96e6c30f8b0..c96e6c30f8b0 100644 --- a/include/asm-sparc/siginfo_64.h +++ b/arch/sparc/include/asm/siginfo_64.h diff --git a/include/asm-sparc/signal.h b/arch/sparc/include/asm/signal.h index 36f5f9e482f7..27ab05dc203e 100644 --- a/include/asm-sparc/signal.h +++ b/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 <asm-sparc/signal_64.h> +#include <asm/signal_64.h> #else -#include <asm-sparc/signal_32.h> +#include <asm/signal_32.h> #endif #endif diff --git a/include/asm-sparc/signal_32.h b/arch/sparc/include/asm/signal_32.h index 96a60ab03ca1..96a60ab03ca1 100644 --- a/include/asm-sparc/signal_32.h +++ b/arch/sparc/include/asm/signal_32.h diff --git a/include/asm-sparc/signal_64.h b/arch/sparc/include/asm/signal_64.h index ab1509a101c5..ab1509a101c5 100644 --- a/include/asm-sparc/signal_64.h +++ b/arch/sparc/include/asm/signal_64.h diff --git a/include/asm-sparc/smp.h b/arch/sparc/include/asm/smp.h index 1f9dedfbabd8..b59672d0e19b 100644 --- a/include/asm-sparc/smp.h +++ b/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 <asm-sparc/smp_64.h> +#include <asm/smp_64.h> #else -#include <asm-sparc/smp_32.h> +#include <asm/smp_32.h> #endif #endif diff --git a/include/asm-sparc/smp_32.h b/arch/sparc/include/asm/smp_32.h index 7201752cf934..7201752cf934 100644 --- a/include/asm-sparc/smp_32.h +++ b/arch/sparc/include/asm/smp_32.h diff --git a/include/asm-sparc/smp_64.h b/arch/sparc/include/asm/smp_64.h index 57224dd37b3a..57224dd37b3a 100644 --- a/include/asm-sparc/smp_64.h +++ b/arch/sparc/include/asm/smp_64.h diff --git a/include/asm-sparc/smpprim.h b/arch/sparc/include/asm/smpprim.h index eb849d862c64..eb849d862c64 100644 --- a/include/asm-sparc/smpprim.h +++ b/arch/sparc/include/asm/smpprim.h diff --git a/include/asm-sparc/socket.h b/arch/sparc/include/asm/socket.h index bf50d0c2d583..bf50d0c2d583 100644 --- a/include/asm-sparc/socket.h +++ b/arch/sparc/include/asm/socket.h diff --git a/include/asm-sparc/sockios.h b/arch/sparc/include/asm/sockios.h index 990ea746486b..990ea746486b 100644 --- a/include/asm-sparc/sockios.h +++ b/arch/sparc/include/asm/sockios.h diff --git a/include/asm-sparc/sparsemem.h b/arch/sparc/include/asm/sparsemem.h index b99d4e4b6d28..b99d4e4b6d28 100644 --- a/include/asm-sparc/sparsemem.h +++ b/arch/sparc/include/asm/sparsemem.h diff --git a/include/asm-sparc/spinlock.h b/arch/sparc/include/asm/spinlock.h index 3b71c50b72eb..f276b0036b2c 100644 --- a/include/asm-sparc/spinlock.h +++ b/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 <asm-sparc/spinlock_64.h> +#include <asm/spinlock_64.h> #else -#include <asm-sparc/spinlock_32.h> +#include <asm/spinlock_32.h> #endif #endif diff --git a/include/asm-sparc/spinlock_32.h b/arch/sparc/include/asm/spinlock_32.h index de2249b267c6..de2249b267c6 100644 --- a/include/asm-sparc/spinlock_32.h +++ b/arch/sparc/include/asm/spinlock_32.h diff --git a/include/asm-sparc/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h index 0006fe9f8c7a..0006fe9f8c7a 100644 --- a/include/asm-sparc/spinlock_64.h +++ b/arch/sparc/include/asm/spinlock_64.h diff --git a/include/asm-sparc/spinlock_types.h b/arch/sparc/include/asm/spinlock_types.h index 37cbe01c585b..37cbe01c585b 100644 --- a/include/asm-sparc/spinlock_types.h +++ b/arch/sparc/include/asm/spinlock_types.h diff --git a/include/asm-sparc/spitfire.h b/arch/sparc/include/asm/spitfire.h index 985ea7e31992..985ea7e31992 100644 --- a/include/asm-sparc/spitfire.h +++ b/arch/sparc/include/asm/spitfire.h diff --git a/include/asm-sparc/sstate.h b/arch/sparc/include/asm/sstate.h index a7c35dbcb281..a7c35dbcb281 100644 --- a/include/asm-sparc/sstate.h +++ b/arch/sparc/include/asm/sstate.h diff --git a/include/asm-sparc/stacktrace.h b/arch/sparc/include/asm/stacktrace.h index 6cee39adf6d6..6cee39adf6d6 100644 --- a/include/asm-sparc/stacktrace.h +++ b/arch/sparc/include/asm/stacktrace.h diff --git a/include/asm-sparc/starfire.h b/arch/sparc/include/asm/starfire.h index 07bafd31e33c..07bafd31e33c 100644 --- a/include/asm-sparc/starfire.h +++ b/arch/sparc/include/asm/starfire.h diff --git a/include/asm-sparc/stat.h b/arch/sparc/include/asm/stat.h index 9fdcaf8c9cd3..d8153013df72 100644 --- a/include/asm-sparc/stat.h +++ b/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 <asm-sparc/stat_64.h> +#include <asm/stat_64.h> #else -#include <asm-sparc/stat_32.h> +#include <asm/stat_32.h> #endif #endif diff --git a/include/asm-sparc/stat_32.h b/arch/sparc/include/asm/stat_32.h index 2299e1d5d94c..2299e1d5d94c 100644 --- a/include/asm-sparc/stat_32.h +++ b/arch/sparc/include/asm/stat_32.h diff --git a/include/asm-sparc/stat_64.h b/arch/sparc/include/asm/stat_64.h index 9650fdea847f..9650fdea847f 100644 --- a/include/asm-sparc/stat_64.h +++ b/arch/sparc/include/asm/stat_64.h diff --git a/include/asm-sparc/statfs.h b/arch/sparc/include/asm/statfs.h index a70cc52e7018..5e937a73743d 100644 --- a/include/asm-sparc/statfs.h +++ b/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 <asm-sparc/statfs_64.h> +#include <asm/statfs_64.h> #else -#include <asm-sparc/statfs_32.h> +#include <asm/statfs_32.h> #endif #endif diff --git a/include/asm-sparc/statfs_32.h b/arch/sparc/include/asm/statfs_32.h index 304520fa8863..304520fa8863 100644 --- a/include/asm-sparc/statfs_32.h +++ b/arch/sparc/include/asm/statfs_32.h diff --git a/include/asm-sparc/statfs_64.h b/arch/sparc/include/asm/statfs_64.h index 79b3c890a5fa..79b3c890a5fa 100644 --- a/include/asm-sparc/statfs_64.h +++ b/arch/sparc/include/asm/statfs_64.h diff --git a/include/asm-sparc/string.h b/arch/sparc/include/asm/string.h index 14c04c7697a5..98b72a0c8e6e 100644 --- a/include/asm-sparc/string.h +++ b/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 <asm-sparc/string_64.h> +#include <asm/string_64.h> #else -#include <asm-sparc/string_32.h> +#include <asm/string_32.h> #endif #endif diff --git a/include/asm-sparc/string_32.h b/arch/sparc/include/asm/string_32.h index 6c5fddb7e6b5..6c5fddb7e6b5 100644 --- a/include/asm-sparc/string_32.h +++ b/arch/sparc/include/asm/string_32.h diff --git a/include/asm-sparc/string_64.h b/arch/sparc/include/asm/string_64.h index 43161f2d17eb..43161f2d17eb 100644 --- a/include/asm-sparc/string_64.h +++ b/arch/sparc/include/asm/string_64.h diff --git a/include/asm-sparc/sun4paddr.h b/arch/sparc/include/asm/sun4paddr.h index d52985f19f42..d52985f19f42 100644 --- a/include/asm-sparc/sun4paddr.h +++ b/arch/sparc/include/asm/sun4paddr.h diff --git a/include/asm-sparc/sun4prom.h b/arch/sparc/include/asm/sun4prom.h index 9c8b4cbf629a..9c8b4cbf629a 100644 --- a/include/asm-sparc/sun4prom.h +++ b/arch/sparc/include/asm/sun4prom.h diff --git a/include/asm-sparc/sunbpp.h b/arch/sparc/include/asm/sunbpp.h index 92ee1a8ff3a2..d81a02eaf78b 100644 --- a/include/asm-sparc/sunbpp.h +++ b/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/include/asm-sparc/swift.h b/arch/sparc/include/asm/swift.h index e535061bf755..e535061bf755 100644 --- a/include/asm-sparc/swift.h +++ b/arch/sparc/include/asm/swift.h diff --git a/arch/sparc/include/asm/syscall.h b/arch/sparc/include/asm/syscall.h new file mode 100644 index 000000000000..7486c605e23c --- /dev/null +++ b/arch/sparc/include/asm/syscall.h @@ -0,0 +1,120 @@ +#ifndef __ASM_SPARC_SYSCALL_H +#define __ASM_SPARC_SYSCALL_H + +#include <linux/kernel.h> +#include <linux/sched.h> +#include <asm/ptrace.h> + +/* The system call number is given by the user in %g1 */ +static inline long syscall_get_nr(struct task_struct *task, + struct pt_regs *regs) +{ + int syscall_p = pt_regs_is_syscall(regs); + + return (syscall_p ? regs->u_regs[UREG_G1] : -1L); +} + +static inline void syscall_rollback(struct task_struct *task, + struct pt_regs *regs) +{ + /* XXX This needs some thought. On Sparc we don't + * XXX save away the original %o0 value somewhere. + * XXX Instead we hold it in register %l5 at the top + * XXX level trap frame and pass this down to the signal + * XXX dispatch code which is the only place that value + * XXX ever was needed. + */ +} + +#ifdef CONFIG_SPARC32 +static inline bool syscall_has_error(struct pt_regs *regs) +{ + return (regs->psr & PSR_C) ? true : false; +} +static inline void syscall_set_error(struct pt_regs *regs) +{ + regs->psr |= PSR_C; +} +static inline void syscall_clear_error(struct pt_regs *regs) +{ + regs->psr &= ~PSR_C; +} +#else +static inline bool syscall_has_error(struct pt_regs *regs) +{ + return (regs->tstate & (TSTATE_XCARRY | TSTATE_ICARRY)) ? true : false; +} +static inline void syscall_set_error(struct pt_regs *regs) +{ + regs->tstate |= (TSTATE_XCARRY | TSTATE_ICARRY); +} +static inline void syscall_clear_error(struct pt_regs *regs) +{ + regs->tstate &= ~(TSTATE_XCARRY | TSTATE_ICARRY); +} +#endif + +static inline long syscall_get_error(struct task_struct *task, + struct pt_regs *regs) +{ + long val = regs->u_regs[UREG_I0]; + + return (syscall_has_error(regs) ? -val : 0); +} + +static inline long syscall_get_return_value(struct task_struct *task, + struct pt_regs *regs) +{ + long val = regs->u_regs[UREG_I0]; + + return val; +} + +static inline void syscall_set_return_value(struct task_struct *task, + struct pt_regs *regs, + int error, long val) +{ + if (error) { + syscall_set_error(regs); + regs->u_regs[UREG_I0] = -error; + } else { + syscall_clear_error(regs); + regs->u_regs[UREG_I0] = val; + } +} + +static inline void syscall_get_arguments(struct task_struct *task, + struct pt_regs *regs, + unsigned int i, unsigned int n, + unsigned long *args) +{ + int zero_extend = 0; + unsigned int j; + +#ifdef CONFIG_SPARC64 + if (test_tsk_thread_flag(task, TIF_32BIT)) + zero_extend = 1; +#endif + + for (j = 0; j < n; j++) { + unsigned long val = regs->u_regs[UREG_I0 + i + j]; + + if (zero_extend) + args[j] = (u32) val; + else + args[j] = val; + } +} + +static inline void syscall_set_arguments(struct task_struct *task, + struct pt_regs *regs, + unsigned int i, unsigned int n, + const unsigned long *args) +{ + unsigned int j; + + for (j = 0; j < n; j++) + regs->u_regs[UREG_I0 + i + j] = args[j]; +} + +#endif /* __ASM_SPARC_SYSCALL_H */ diff --git a/include/asm-sparc/syscalls.h b/arch/sparc/include/asm/syscalls.h index 45a43f637a14..45a43f637a14 100644 --- a/include/asm-sparc/syscalls.h +++ b/arch/sparc/include/asm/syscalls.h diff --git a/include/asm-sparc/sysen.h b/arch/sparc/include/asm/sysen.h index 6af34abde6e7..6af34abde6e7 100644 --- a/include/asm-sparc/sysen.h +++ b/arch/sparc/include/asm/sysen.h diff --git a/include/asm-sparc/system.h b/arch/sparc/include/asm/system.h index 15e2a3bc4f61..7944a7cfc996 100644 --- a/include/asm-sparc/system.h +++ b/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 <asm-sparc/system_64.h> +#include <asm/system_64.h> #else -#include <asm-sparc/system_32.h> +#include <asm/system_32.h> #endif #endif diff --git a/include/asm-sparc/system_32.h b/arch/sparc/include/asm/system_32.h index b4b024445fc9..b4b024445fc9 100644 --- a/include/asm-sparc/system_32.h +++ b/arch/sparc/include/asm/system_32.h diff --git a/include/asm-sparc/system_64.h b/arch/sparc/include/asm/system_64.h index db9e742a406a..db9e742a406a 100644 --- a/include/asm-sparc/system_64.h +++ b/arch/sparc/include/asm/system_64.h diff --git a/include/asm-sparc/termbits.h b/arch/sparc/include/asm/termbits.h index d6ca3e2754f5..d6ca3e2754f5 100644 --- a/include/asm-sparc/termbits.h +++ b/arch/sparc/include/asm/termbits.h diff --git a/include/asm-sparc/termios.h b/arch/sparc/include/asm/termios.h index e8ba95399643..e8ba95399643 100644 --- a/include/asm-sparc/termios.h +++ b/arch/sparc/include/asm/termios.h diff --git a/include/asm-sparc/thread_info.h b/arch/sparc/include/asm/thread_info.h index 64155cf89f37..122d7acc07e6 100644 --- a/include/asm-sparc/thread_info.h +++ b/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 <asm-sparc/thread_info_64.h> +#include <asm/thread_info_64.h> #else -#include <asm-sparc/thread_info_32.h> +#include <asm/thread_info_32.h> #endif #endif diff --git a/include/asm-sparc/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h index 2cf9db044055..cbb892d0dff0 100644 --- a/include/asm-sparc/thread_info_32.h +++ b/arch/sparc/include/asm/thread_info_32.h @@ -130,7 +130,7 @@ BTFIXUPDEF_CALL(void, free_thread_info, struct thread_info *) * thread information flag bit numbers */ #define TIF_SYSCALL_TRACE 0 /* syscall trace active */ -/* flag bit 1 is available */ +#define TIF_NOTIFY_RESUME 1 /* callback before returning to user */ #define TIF_SIGPENDING 2 /* signal pending */ #define TIF_NEED_RESCHED 3 /* rescheduling necessary */ #define TIF_RESTORE_SIGMASK 4 /* restore signal mask in do_signal() */ @@ -142,12 +142,17 @@ BTFIXUPDEF_CALL(void, free_thread_info, struct thread_info *) /* as above, but as bit values */ #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) +#define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME) #define _TIF_SIGPENDING (1<<TIF_SIGPENDING) #define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED) #define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK) #define _TIF_USEDFPU (1<<TIF_USEDFPU) #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG) +#define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | \ + _TIF_SIGPENDING | \ + _TIF_RESTORE_SIGMASK) + #endif /* __KERNEL__ */ #endif /* _ASM_THREAD_INFO_H */ diff --git a/include/asm-sparc/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h index 960969d5ad06..c0a737d7292c 100644 --- a/include/asm-sparc/thread_info_64.h +++ b/arch/sparc/include/asm/thread_info_64.h @@ -219,7 +219,7 @@ register struct thread_info *current_thread_info_reg asm("g6"); * nop */ #define TIF_SYSCALL_TRACE 0 /* syscall trace active */ -/* flags bit 1 is available */ +#define TIF_NOTIFY_RESUME 1 /* callback before returning to user */ #define TIF_SIGPENDING 2 /* signal pending */ #define TIF_NEED_RESCHED 3 /* rescheduling necessary */ #define TIF_PERFCTR 4 /* performance counters active */ @@ -239,6 +239,7 @@ register struct thread_info *current_thread_info_reg asm("g6"); #define TIF_POLLING_NRFLAG 14 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) +#define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME) #define _TIF_SIGPENDING (1<<TIF_SIGPENDING) #define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED) #define _TIF_PERFCTR (1<<TIF_PERFCTR) @@ -250,8 +251,9 @@ register struct thread_info *current_thread_info_reg asm("g6"); #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG) #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \ - (_TIF_SIGPENDING | \ - _TIF_NEED_RESCHED | _TIF_PERFCTR)) + _TIF_DO_NOTIFY_RESUME_MASK | \ + _TIF_NEED_RESCHED | _TIF_PERFCTR) +#define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING) /* * Thread-synchronous status. diff --git a/include/asm-sparc/timer.h b/arch/sparc/include/asm/timer.h index 475baa05a96e..612fd2779d9e 100644 --- a/include/asm-sparc/timer.h +++ b/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 <asm-sparc/timer_64.h> +#include <asm/timer_64.h> #else -#include <asm-sparc/timer_32.h> +#include <asm/timer_32.h> #endif #endif diff --git a/include/asm-sparc/timer_32.h b/arch/sparc/include/asm/timer_32.h index 361e53898dd7..361e53898dd7 100644 --- a/include/asm-sparc/timer_32.h +++ b/arch/sparc/include/asm/timer_32.h diff --git a/include/asm-sparc/timer_64.h b/arch/sparc/include/asm/timer_64.h index 5b779fd1f788..5b779fd1f788 100644 --- a/include/asm-sparc/timer_64.h +++ b/arch/sparc/include/asm/timer_64.h diff --git a/include/asm-sparc/timex.h b/arch/sparc/include/asm/timex.h index 01d9f199d452..70cc37b73827 100644 --- a/include/asm-sparc/timex.h +++ b/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 <asm-sparc/timex_64.h> +#include <asm/timex_64.h> #else -#include <asm-sparc/timex_32.h> +#include <asm/timex_32.h> #endif #endif diff --git a/include/asm-sparc/timex_32.h b/arch/sparc/include/asm/timex_32.h index 71b45c90ccae..b6ccdb0d6f7d 100644 --- a/include/asm-sparc/timex_32.h +++ b/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/include/asm-sparc/timex_64.h b/arch/sparc/include/asm/timex_64.h index c622535c4560..18b30bc9823b 100644 --- a/include/asm-sparc/timex_64.h +++ b/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/include/asm-sparc/tlb.h b/arch/sparc/include/asm/tlb.h index a821057327c4..92d0393bbcdc 100644 --- a/include/asm-sparc/tlb.h +++ b/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 <asm-sparc/tlb_64.h> +#include <asm/tlb_64.h> #else -#include <asm-sparc/tlb_32.h> +#include <asm/tlb_32.h> #endif #endif diff --git a/include/asm-sparc/tlb_32.h b/arch/sparc/include/asm/tlb_32.h index 6d02d1ce53f3..6d02d1ce53f3 100644 --- a/include/asm-sparc/tlb_32.h +++ b/arch/sparc/include/asm/tlb_32.h diff --git a/include/asm-sparc/tlb_64.h b/arch/sparc/include/asm/tlb_64.h index ec81cdedef2c..ec81cdedef2c 100644 --- a/include/asm-sparc/tlb_64.h +++ b/arch/sparc/include/asm/tlb_64.h diff --git a/include/asm-sparc/tlbflush.h b/arch/sparc/include/asm/tlbflush.h index 6e6bc12227b8..2c9629fad1e2 100644 --- a/include/asm-sparc/tlbflush.h +++ b/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 <asm-sparc/tlbflush_64.h> +#include <asm/tlbflush_64.h> #else -#include <asm-sparc/tlbflush_32.h> +#include <asm/tlbflush_32.h> #endif #endif diff --git a/include/asm-sparc/tlbflush_32.h b/arch/sparc/include/asm/tlbflush_32.h index fe0a71abc9bb..fe0a71abc9bb 100644 --- a/include/asm-sparc/tlbflush_32.h +++ b/arch/sparc/include/asm/tlbflush_32.h diff --git a/include/asm-sparc/tlbflush_64.h b/arch/sparc/include/asm/tlbflush_64.h index fbb675dbe0c9..fbb675dbe0c9 100644 --- a/include/asm-sparc/tlbflush_64.h +++ b/arch/sparc/include/asm/tlbflush_64.h diff --git a/include/asm-sparc/topology.h b/arch/sparc/include/asm/topology.h index ed13630f32e2..ee4f191d394a 100644 --- a/include/asm-sparc/topology.h +++ b/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 <asm-sparc/topology_64.h> +#include <asm/topology_64.h> #else -#include <asm-sparc/topology_32.h> +#include <asm/topology_32.h> #endif #endif diff --git a/include/asm-sparc/topology_32.h b/arch/sparc/include/asm/topology_32.h index ee5ac9c9da28..ee5ac9c9da28 100644 --- a/include/asm-sparc/topology_32.h +++ b/arch/sparc/include/asm/topology_32.h diff --git a/include/asm-sparc/topology_64.h b/arch/sparc/include/asm/topology_64.h index 001c04027c82..001c04027c82 100644 --- a/include/asm-sparc/topology_64.h +++ b/arch/sparc/include/asm/topology_64.h diff --git a/include/asm-sparc/traps.h b/arch/sparc/include/asm/traps.h index bebdbf8f43a8..bebdbf8f43a8 100644 --- a/include/asm-sparc/traps.h +++ b/arch/sparc/include/asm/traps.h diff --git a/include/asm-sparc/tsb.h b/arch/sparc/include/asm/tsb.h index 76e4299dd9bc..76e4299dd9bc 100644 --- a/include/asm-sparc/tsb.h +++ b/arch/sparc/include/asm/tsb.h diff --git a/include/asm-sparc/tsunami.h b/arch/sparc/include/asm/tsunami.h index 5bbd1d523baa..5bbd1d523baa 100644 --- a/include/asm-sparc/tsunami.h +++ b/arch/sparc/include/asm/tsunami.h diff --git a/include/asm-sparc/ttable.h b/arch/sparc/include/asm/ttable.h index 5708ba2719fb..5708ba2719fb 100644 --- a/include/asm-sparc/ttable.h +++ b/arch/sparc/include/asm/ttable.h diff --git a/include/asm-sparc/turbosparc.h b/arch/sparc/include/asm/turbosparc.h index 17c73282db0a..17c73282db0a 100644 --- a/include/asm-sparc/turbosparc.h +++ b/arch/sparc/include/asm/turbosparc.h diff --git a/include/asm-sparc/types.h b/arch/sparc/include/asm/types.h index 8c28fde5eaa2..8c28fde5eaa2 100644 --- a/include/asm-sparc/types.h +++ b/arch/sparc/include/asm/types.h diff --git a/include/asm-sparc/uaccess.h b/arch/sparc/include/asm/uaccess.h index 424facce5238..e88fbe5c0457 100644 --- a/include/asm-sparc/uaccess.h +++ b/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 <asm-sparc/uaccess_64.h> +#include <asm/uaccess_64.h> #else -#include <asm-sparc/uaccess_32.h> +#include <asm/uaccess_32.h> #endif #endif diff --git a/include/asm-sparc/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h index 47d5619d43fa..47d5619d43fa 100644 --- a/include/asm-sparc/uaccess_32.h +++ b/arch/sparc/include/asm/uaccess_32.h diff --git a/include/asm-sparc/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h index 296ef30e05c8..296ef30e05c8 100644 --- a/include/asm-sparc/uaccess_64.h +++ b/arch/sparc/include/asm/uaccess_64.h diff --git a/include/asm-sparc/uctx.h b/arch/sparc/include/asm/uctx.h index dc937c75ffdd..dc937c75ffdd 100644 --- a/include/asm-sparc/uctx.h +++ b/arch/sparc/include/asm/uctx.h diff --git a/include/asm-sparc/unaligned.h b/arch/sparc/include/asm/unaligned.h index 11d2d5fb5902..11d2d5fb5902 100644 --- a/include/asm-sparc/unaligned.h +++ b/arch/sparc/include/asm/unaligned.h diff --git a/include/asm-sparc/unistd.h b/arch/sparc/include/asm/unistd.h index 3c2609618a09..4207fb362da0 100644 --- a/include/asm-sparc/unistd.h +++ b/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 <asm-sparc/unistd_64.h> +#include <asm/unistd_64.h> #else -#include <asm-sparc/unistd_32.h> +#include <asm/unistd_32.h> #endif #endif diff --git a/include/asm-sparc/unistd_32.h b/arch/sparc/include/asm/unistd_32.h index 648643a9f139..648643a9f139 100644 --- a/include/asm-sparc/unistd_32.h +++ b/arch/sparc/include/asm/unistd_32.h diff --git a/include/asm-sparc/unistd_64.h b/arch/sparc/include/asm/unistd_64.h index c5cc0e052321..c5cc0e052321 100644 --- a/include/asm-sparc/unistd_64.h +++ b/arch/sparc/include/asm/unistd_64.h diff --git a/include/asm-sparc/upa.h b/arch/sparc/include/asm/upa.h index 5b1633223f92..5b1633223f92 100644 --- a/include/asm-sparc/upa.h +++ b/arch/sparc/include/asm/upa.h diff --git a/include/asm-sparc/user.h b/arch/sparc/include/asm/user.h index 3400ea87f148..3400ea87f148 100644 --- a/include/asm-sparc/user.h +++ b/arch/sparc/include/asm/user.h diff --git a/include/asm-sparc/utrap.h b/arch/sparc/include/asm/utrap.h index 9da37babbe5b..b10e527c22d9 100644 --- a/include/asm-sparc/utrap.h +++ b/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/include/asm-sparc/vac-ops.h b/arch/sparc/include/asm/vac-ops.h index d10527611f11..d10527611f11 100644 --- a/include/asm-sparc/vac-ops.h +++ b/arch/sparc/include/asm/vac-ops.h diff --git a/include/asm-sparc/vaddrs.h b/arch/sparc/include/asm/vaddrs.h index a22fed5a3c6b..541e13755cec 100644 --- a/include/asm-sparc/vaddrs.h +++ b/arch/sparc/include/asm/vaddrs.h @@ -4,7 +4,7 @@ #include <asm/head.h> /* - * 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/include/asm-sparc/vfc_ioctls.h b/arch/sparc/include/asm/vfc_ioctls.h index af8b69007b22..af8b69007b22 100644 --- a/include/asm-sparc/vfc_ioctls.h +++ b/arch/sparc/include/asm/vfc_ioctls.h diff --git a/include/asm-sparc/vga.h b/arch/sparc/include/asm/vga.h index c69d5b2ba19a..c69d5b2ba19a 100644 --- a/include/asm-sparc/vga.h +++ b/arch/sparc/include/asm/vga.h diff --git a/include/asm-sparc/viking.h b/arch/sparc/include/asm/viking.h index 989930aeb093..989930aeb093 100644 --- a/include/asm-sparc/viking.h +++ b/arch/sparc/include/asm/viking.h diff --git a/include/asm-sparc/vio.h b/arch/sparc/include/asm/vio.h index d4de32f0f8af..d4de32f0f8af 100644 --- a/include/asm-sparc/vio.h +++ b/arch/sparc/include/asm/vio.h diff --git a/include/asm-sparc/visasm.h b/arch/sparc/include/asm/visasm.h index de797b9bf552..de797b9bf552 100644 --- a/include/asm-sparc/visasm.h +++ b/arch/sparc/include/asm/visasm.h diff --git a/include/asm-sparc/watchdog.h b/arch/sparc/include/asm/watchdog.h index 5baf2d3919cf..5baf2d3919cf 100644 --- a/include/asm-sparc/watchdog.h +++ b/arch/sparc/include/asm/watchdog.h diff --git a/include/asm-sparc/winmacro.h b/arch/sparc/include/asm/winmacro.h index 5b0a06dc3bcb..5b0a06dc3bcb 100644 --- a/include/asm-sparc/winmacro.h +++ b/arch/sparc/include/asm/winmacro.h diff --git a/include/asm-sparc/xor.h b/arch/sparc/include/asm/xor.h index 35089a838c3f..8ed591c7db2d 100644 --- a/include/asm-sparc/xor.h +++ b/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 <asm-sparc/xor_64.h> +#include <asm/xor_64.h> #else -#include <asm-sparc/xor_32.h> +#include <asm/xor_32.h> #endif #endif diff --git a/include/asm-sparc/xor_32.h b/arch/sparc/include/asm/xor_32.h index f34b2cfa8206..44bfa0787f3f 100644 --- a/include/asm-sparc/xor_32.h +++ b/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/include/asm-sparc/xor_64.h b/arch/sparc/include/asm/xor_64.h index a0233884fc94..bee4bf4be3af 100644 --- a/include/asm-sparc/xor_64.h +++ b/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/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S index 2f96256dc515..e8cdf715a546 100644 --- a/arch/sparc/kernel/entry.S +++ b/arch/sparc/kernel/entry.S @@ -1196,8 +1196,9 @@ sys_rt_sigreturn: be 1f nop + add %sp, STACKFRAME_SZ, %o0 call syscall_trace - nop + mov 1, %o1 1: /* We are returning to a signal handler. */ @@ -1287,8 +1288,12 @@ linux_fast_syscall: mov %i3, %o3 linux_syscall_trace: + add %sp, STACKFRAME_SZ, %o0 call syscall_trace - nop + mov 0, %o1 + cmp %o0, 0 + bne 3f + mov -ENOSYS, %o0 mov %i0, %o0 mov %i1, %o1 mov %i2, %o2 @@ -1337,6 +1342,7 @@ syscall_is_too_hard: call %l7 mov %i5, %o5 +3: st %o0, [%sp + STACKFRAME_SZ + PT_I0] ret_sys_call: @@ -1374,6 +1380,8 @@ ret_sys_call: st %l2, [%sp + STACKFRAME_SZ + PT_NPC] linux_syscall_trace2: + add %sp, STACKFRAME_SZ, %o0 + mov 1, %o1 call syscall_trace add %l1, 0x4, %l2 /* npc = npc+4 */ st %l1, [%sp + STACKFRAME_SZ + PT_PC] diff --git a/arch/sparc/kernel/ptrace.c b/arch/sparc/kernel/ptrace.c index 81f3b929743f..20699c701412 100644 --- a/arch/sparc/kernel/ptrace.c +++ b/arch/sparc/kernel/ptrace.c @@ -21,6 +21,7 @@ #include <linux/signal.h> #include <linux/regset.h> #include <linux/elf.h> +#include <linux/tracehook.h> #include <asm/pgtable.h> #include <asm/system.h> @@ -450,21 +451,16 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) return ret; } -asmlinkage void syscall_trace(void) +asmlinkage int syscall_trace(struct pt_regs *regs, int syscall_exit_p) { - if (!test_thread_flag(TIF_SYSCALL_TRACE)) - return; - if (!(current->ptrace & PT_PTRACED)) - return; - ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD) - ? 0x80 : 0)); - /* - * this isn't the same as continuing with a signal, but it will do - * for normal use. strace only continues with a signal if the - * stopping signal is not SIGTRAP. -brl - */ - if (current->exit_code) { - send_sig (current->exit_code, current, 1); - current->exit_code = 0; + int ret = 0; + + if (test_thread_flag(TIF_SYSCALL_TRACE)) { + if (syscall_exit_p) + tracehook_report_syscall_exit(regs, 0); + else + ret = tracehook_report_syscall_entry(regs); } + + return ret; } diff --git a/arch/sparc/kernel/rtrap.S b/arch/sparc/kernel/rtrap.S index 891f460b7b96..4da2e1f66290 100644 --- a/arch/sparc/kernel/rtrap.S +++ b/arch/sparc/kernel/rtrap.S @@ -69,12 +69,13 @@ ret_trap_lockless_ipi: ld [%curptr + TI_FLAGS], %g2 signal_p: - andcc %g2, (_TIF_SIGPENDING|_TIF_RESTORE_SIGMASK), %g0 + andcc %g2, _TIF_DO_NOTIFY_RESUME_MASK, %g0 bz,a ret_trap_continue ld [%sp + STACKFRAME_SZ + PT_PSR], %t_psr + mov %g2, %o2 mov %l5, %o1 - call do_signal + call do_notify_resume add %sp, STACKFRAME_SZ, %o0 ! pt_regs ptr /* Fall through. */ diff --git a/arch/sparc/kernel/signal.c b/arch/sparc/kernel/signal.c index 3fd1df9f9ba7..c94f91c8b6e0 100644 --- a/arch/sparc/kernel/signal.c +++ b/arch/sparc/kernel/signal.c @@ -18,6 +18,7 @@ #include <linux/smp.h> #include <linux/binfmts.h> /* do_coredum */ #include <linux/bitops.h> +#include <linux/tracehook.h> #include <asm/uaccess.h> #include <asm/ptrace.h> @@ -513,7 +514,7 @@ static inline void syscall_restart(unsigned long orig_i0, struct pt_regs *regs, * want to handle. Thus you cannot kill init even with a SIGKILL even by * mistake. */ -asmlinkage void do_signal(struct pt_regs * regs, unsigned long orig_i0) +static void do_signal(struct pt_regs *regs, unsigned long orig_i0) { struct k_sigaction ka; int restart_syscall; @@ -552,6 +553,8 @@ asmlinkage void do_signal(struct pt_regs * regs, unsigned long orig_i0) */ if (test_thread_flag(TIF_RESTORE_SIGMASK)) clear_thread_flag(TIF_RESTORE_SIGMASK); + + tracehook_signal_handler(signr, &info, &ka, regs, 0); return; } if (restart_syscall && @@ -579,6 +582,17 @@ asmlinkage void do_signal(struct pt_regs * regs, unsigned long orig_i0) } } +void do_notify_resume(struct pt_regs *regs, unsigned long orig_i0, + unsigned long thread_info_flags) +{ + if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK)) + do_signal(regs, orig_i0); + if (thread_info_flags & _TIF_NOTIFY_RESUME) { + clear_thread_flag(TIF_NOTIFY_RESUME); + tracehook_notify_resume(regs); + } +} + asmlinkage int do_sys_sigstack(struct sigstack __user *ssptr, struct sigstack __user *ossptr, unsigned long sp) diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index 7c88263256af..923a98959fa7 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig @@ -17,6 +17,7 @@ config SPARC64 select HAVE_LMB select HAVE_ARCH_KGDB select USE_GENERIC_SMP_HELPERS if SMP + select HAVE_ARCH_TRACEHOOK config GENERIC_TIME bool diff --git a/arch/sparc64/kernel/compat_audit.c b/arch/sparc64/kernel/compat_audit.c index c1979482aa92..c831b0a4e660 100644 --- a/arch/sparc64/kernel/compat_audit.c +++ b/arch/sparc64/kernel/compat_audit.c @@ -1,4 +1,4 @@ -#include <asm-sparc/unistd.h> +#include <asm/unistd_32.h> unsigned sparc32_dir_class[] = { #include <asm-generic/audit_dir_write.h> diff --git a/arch/sparc64/kernel/entry.h b/arch/sparc64/kernel/entry.h index 32fbab620852..fc294a292899 100644 --- a/arch/sparc64/kernel/entry.h +++ b/arch/sparc64/kernel/entry.h @@ -22,8 +22,7 @@ extern void do_notify_resume(struct pt_regs *regs, unsigned long orig_i0, unsigned long thread_info_flags); -extern asmlinkage void syscall_trace(struct pt_regs *regs, - int syscall_exit_p); +extern asmlinkage int syscall_trace(struct pt_regs *regs, int syscall_exit_p); extern void bad_trap_tl1(struct pt_regs *regs, long lvl); diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c index f6c9fc92921d..bd578cc4856d 100644 --- a/arch/sparc64/kernel/ptrace.c +++ b/arch/sparc64/kernel/ptrace.c @@ -23,6 +23,7 @@ #include <linux/audit.h> #include <linux/signal.h> #include <linux/regset.h> +#include <linux/tracehook.h> #include <linux/compat.h> #include <linux/elf.h> @@ -1049,8 +1050,10 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) return ret; } -asmlinkage void syscall_trace(struct pt_regs *regs, int syscall_exit_p) +asmlinkage int syscall_trace(struct pt_regs *regs, int syscall_exit_p) { + int ret = 0; + /* do the secure computing check first */ secure_computing(regs->u_regs[UREG_G1]); @@ -1064,27 +1067,14 @@ asmlinkage void syscall_trace(struct pt_regs *regs, int syscall_exit_p) audit_syscall_exit(result, regs->u_regs[UREG_I0]); } - if (!(current->ptrace & PT_PTRACED)) - goto out; - - if (!test_thread_flag(TIF_SYSCALL_TRACE)) - goto out; - - ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD) - ? 0x80 : 0)); - - /* - * this isn't the same as continuing with a signal, but it will do - * for normal use. strace only continues with a signal if the - * stopping signal is not SIGTRAP. -brl - */ - if (current->exit_code) { - send_sig(current->exit_code, current, 1); - current->exit_code = 0; + if (test_thread_flag(TIF_SYSCALL_TRACE)) { + if (syscall_exit_p) + tracehook_report_syscall_exit(regs, 0); + else + ret = tracehook_report_syscall_entry(regs); } -out: - if (unlikely(current->audit_context) && !syscall_exit_p) + if (unlikely(current->audit_context) && !syscall_exit_p && !ret) audit_syscall_entry((test_thread_flag(TIF_32BIT) ? AUDIT_ARCH_SPARC : AUDIT_ARCH_SPARC64), @@ -1093,4 +1083,6 @@ out: regs->u_regs[UREG_I1], regs->u_regs[UREG_I2], regs->u_regs[UREG_I3]); + + return ret; } diff --git a/arch/sparc64/kernel/rtrap.S b/arch/sparc64/kernel/rtrap.S index c6fc695fe1fe..97a993c1f7f3 100644 --- a/arch/sparc64/kernel/rtrap.S +++ b/arch/sparc64/kernel/rtrap.S @@ -46,7 +46,7 @@ __handle_user_windows: wrpr %g0, RTRAP_PSTATE_IRQOFF, %pstate ldx [%g6 + TI_FLAGS], %l0 -1: andcc %l0, _TIF_SIGPENDING, %g0 +1: andcc %l0, _TIF_DO_NOTIFY_RESUME_MASK, %g0 be,pt %xcc, __handle_user_windows_continue nop mov %l5, %o1 @@ -86,7 +86,7 @@ __handle_perfctrs: wrpr %g0, RTRAP_PSTATE, %pstate wrpr %g0, RTRAP_PSTATE_IRQOFF, %pstate ldx [%g6 + TI_FLAGS], %l0 -1: andcc %l0, _TIF_SIGPENDING, %g0 +1: andcc %l0, _TIF_DO_NOTIFY_RESUME_MASK, %g0 be,pt %xcc, __handle_perfctrs_continue sethi %hi(TSTATE_PEF), %o0 @@ -195,7 +195,7 @@ __handle_preemption_continue: andcc %l1, %o0, %g0 andcc %l0, _TIF_NEED_RESCHED, %g0 bne,pn %xcc, __handle_preemption - andcc %l0, _TIF_SIGPENDING, %g0 + andcc %l0, _TIF_DO_NOTIFY_RESUME_MASK, %g0 bne,pn %xcc, __handle_signal __handle_signal_continue: ldub [%g6 + TI_WSAVED], %o2 diff --git a/arch/sparc64/kernel/signal.c b/arch/sparc64/kernel/signal.c index 9667e96fd513..d1b84456a9ee 100644 --- a/arch/sparc64/kernel/signal.c +++ b/arch/sparc64/kernel/signal.c @@ -17,11 +17,13 @@ #include <linux/errno.h> #include <linux/wait.h> #include <linux/ptrace.h> +#include <linux/tracehook.h> #include <linux/unistd.h> #include <linux/mm.h> #include <linux/tty.h> #include <linux/binfmts.h> #include <linux/bitops.h> +#include <linux/tracehook.h> #include <asm/uaccess.h> #include <asm/ptrace.h> @@ -574,6 +576,8 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0) * clear the TS_RESTORE_SIGMASK flag. */ current_thread_info()->status &= ~TS_RESTORE_SIGMASK; + + tracehook_signal_handler(signr, &info, &ka, regs, 0); return; } if (restart_syscall && @@ -605,4 +609,8 @@ void do_notify_resume(struct pt_regs *regs, unsigned long orig_i0, unsigned long { if (thread_info_flags & _TIF_SIGPENDING) do_signal(regs, orig_i0); + if (thread_info_flags & _TIF_NOTIFY_RESUME) { + clear_thread_flag(TIF_NOTIFY_RESUME); + tracehook_notify_resume(regs); + } } diff --git a/arch/sparc64/kernel/signal32.c b/arch/sparc64/kernel/signal32.c index 97cdd1bf4a10..ba5b09ad6666 100644 --- a/arch/sparc64/kernel/signal32.c +++ b/arch/sparc64/kernel/signal32.c @@ -19,6 +19,7 @@ #include <linux/binfmts.h> #include <linux/compat.h> #include <linux/bitops.h> +#include <linux/tracehook.h> #include <asm/uaccess.h> #include <asm/ptrace.h> @@ -794,6 +795,8 @@ void do_signal32(sigset_t *oldset, struct pt_regs * regs, * clear the TS_RESTORE_SIGMASK flag. */ current_thread_info()->status &= ~TS_RESTORE_SIGMASK; + + tracehook_signal_handler(signr, &info, &ka, regs, 0); return; } if (restart_syscall && diff --git a/arch/sparc64/kernel/syscalls.S b/arch/sparc64/kernel/syscalls.S index db19ed67acf6..a2f24270ed8a 100644 --- a/arch/sparc64/kernel/syscalls.S +++ b/arch/sparc64/kernel/syscalls.S @@ -162,6 +162,8 @@ linux_syscall_trace32: add %sp, PTREGS_OFF, %o0 call syscall_trace clr %o1 + brnz,pn %o0, 3f + mov -ENOSYS, %o0 srl %i0, 0, %o0 srl %i4, 0, %o4 srl %i1, 0, %o1 @@ -173,6 +175,8 @@ linux_syscall_trace: add %sp, PTREGS_OFF, %o0 call syscall_trace clr %o1 + brnz,pn %o0, 3f + mov -ENOSYS, %o0 mov %i0, %o0 mov %i1, %o1 mov %i2, %o2 diff --git a/include/asm-sparc/Kbuild b/include/asm-sparc/Kbuild deleted file mode 100644 index 6cdaf9d33b38..000000000000 --- a/include/asm-sparc/Kbuild +++ /dev/null @@ -1 +0,0 @@ -# dummy file to avoid breaking make headers_install diff --git a/include/asm-sparc64/Kbuild b/include/asm-sparc64/Kbuild deleted file mode 100644 index 6cdaf9d33b38..000000000000 --- a/include/asm-sparc64/Kbuild +++ /dev/null @@ -1 +0,0 @@ -# dummy file to avoid breaking make headers_install diff --git a/include/asm-sparc64/agp.h b/include/asm-sparc64/agp.h deleted file mode 100644 index eb8d4b3f5163..000000000000 --- a/include/asm-sparc64/agp.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/agp.h> diff --git a/include/asm-sparc64/apb.h b/include/asm-sparc64/apb.h deleted file mode 100644 index 5e236ca6e492..000000000000 --- a/include/asm-sparc64/apb.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/apb.h> diff --git a/include/asm-sparc64/asi.h b/include/asm-sparc64/asi.h deleted file mode 100644 index 9b7110c516e8..000000000000 --- a/include/asm-sparc64/asi.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/asi.h> diff --git a/include/asm-sparc64/atomic.h b/include/asm-sparc64/atomic.h deleted file mode 100644 index f5126826ba34..000000000000 --- a/include/asm-sparc64/atomic.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/atomic.h> diff --git a/include/asm-sparc64/auxio.h b/include/asm-sparc64/auxio.h deleted file mode 100644 index 46c9042f30b4..000000000000 --- a/include/asm-sparc64/auxio.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/auxio.h> diff --git a/include/asm-sparc64/auxvec.h b/include/asm-sparc64/auxvec.h deleted file mode 100644 index 1f45c67d7316..000000000000 --- a/include/asm-sparc64/auxvec.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/auxvec.h> diff --git a/include/asm-sparc64/backoff.h b/include/asm-sparc64/backoff.h deleted file mode 100644 index 8ee26d947e0e..000000000000 --- a/include/asm-sparc64/backoff.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/backoff.h> diff --git a/include/asm-sparc64/bbc.h b/include/asm-sparc64/bbc.h deleted file mode 100644 index 06e8b6306514..000000000000 --- a/include/asm-sparc64/bbc.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/bbc.h> diff --git a/include/asm-sparc64/bitops.h b/include/asm-sparc64/bitops.h deleted file mode 100644 index 204404355bdd..000000000000 --- a/include/asm-sparc64/bitops.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/bitops.h> diff --git a/include/asm-sparc64/bpp.h b/include/asm-sparc64/bpp.h deleted file mode 100644 index 514eee20272e..000000000000 --- a/include/asm-sparc64/bpp.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/bpp.h> diff --git a/include/asm-sparc64/bug.h b/include/asm-sparc64/bug.h deleted file mode 100644 index 3433737c7a67..000000000000 --- a/include/asm-sparc64/bug.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/bug.h> diff --git a/include/asm-sparc64/bugs.h b/include/asm-sparc64/bugs.h deleted file mode 100644 index 04ae9e2818cf..000000000000 --- a/include/asm-sparc64/bugs.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/bugs.h> diff --git a/include/asm-sparc64/byteorder.h b/include/asm-sparc64/byteorder.h deleted file mode 100644 index f672855bee17..000000000000 --- a/include/asm-sparc64/byteorder.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/byteorder.h> diff --git a/include/asm-sparc64/cache.h b/include/asm-sparc64/cache.h deleted file mode 100644 index fa9de5cadbf1..000000000000 --- a/include/asm-sparc64/cache.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/cache.h> diff --git a/include/asm-sparc64/cacheflush.h b/include/asm-sparc64/cacheflush.h deleted file mode 100644 index cf5b6b3e8a55..000000000000 --- a/include/asm-sparc64/cacheflush.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/cacheflush.h> diff --git a/include/asm-sparc64/chafsr.h b/include/asm-sparc64/chafsr.h deleted file mode 100644 index aaab97562a39..000000000000 --- a/include/asm-sparc64/chafsr.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/chafsr.h> diff --git a/include/asm-sparc64/checksum.h b/include/asm-sparc64/checksum.h deleted file mode 100644 index c3966c5e29d8..000000000000 --- a/include/asm-sparc64/checksum.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/checksum.h> diff --git a/include/asm-sparc64/chmctrl.h b/include/asm-sparc64/chmctrl.h deleted file mode 100644 index eb757b483b30..000000000000 --- a/include/asm-sparc64/chmctrl.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/chmctrl.h> diff --git a/include/asm-sparc64/cmt.h b/include/asm-sparc64/cmt.h deleted file mode 100644 index b19b445cb810..000000000000 --- a/include/asm-sparc64/cmt.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/cmt.h> diff --git a/include/asm-sparc64/compat.h b/include/asm-sparc64/compat.h deleted file mode 100644 index 8c155d221952..000000000000 --- a/include/asm-sparc64/compat.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/compat.h> diff --git a/include/asm-sparc64/compat_signal.h b/include/asm-sparc64/compat_signal.h deleted file mode 100644 index 7187dcc8cac7..000000000000 --- a/include/asm-sparc64/compat_signal.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/compat_signal.h> diff --git a/include/asm-sparc64/cpudata.h b/include/asm-sparc64/cpudata.h deleted file mode 100644 index 3220e134a579..000000000000 --- a/include/asm-sparc64/cpudata.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/cpudata.h> diff --git a/include/asm-sparc64/cputime.h b/include/asm-sparc64/cputime.h deleted file mode 100644 index 435f37a92f7c..000000000000 --- a/include/asm-sparc64/cputime.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/cputime.h> diff --git a/include/asm-sparc64/current.h b/include/asm-sparc64/current.h deleted file mode 100644 index a7904a7f53a8..000000000000 --- a/include/asm-sparc64/current.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/current.h> diff --git a/include/asm-sparc64/dcr.h b/include/asm-sparc64/dcr.h deleted file mode 100644 index d67613b1f5fe..000000000000 --- a/include/asm-sparc64/dcr.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/dcr.h> diff --git a/include/asm-sparc64/dcu.h b/include/asm-sparc64/dcu.h deleted file mode 100644 index 28853f4968d1..000000000000 --- a/include/asm-sparc64/dcu.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/dcu.h> diff --git a/include/asm-sparc64/delay.h b/include/asm-sparc64/delay.h deleted file mode 100644 index 33dc5589d841..000000000000 --- a/include/asm-sparc64/delay.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/delay.h> diff --git a/include/asm-sparc64/device.h b/include/asm-sparc64/device.h deleted file mode 100644 index 4145c47097e2..000000000000 --- a/include/asm-sparc64/device.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/device.h> diff --git a/include/asm-sparc64/display7seg.h b/include/asm-sparc64/display7seg.h deleted file mode 100644 index e74f046b41de..000000000000 --- a/include/asm-sparc64/display7seg.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/display7seg.h> diff --git a/include/asm-sparc64/div64.h b/include/asm-sparc64/div64.h deleted file mode 100644 index 928c94f99ecf..000000000000 --- a/include/asm-sparc64/div64.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/div64.h> diff --git a/include/asm-sparc64/dma-mapping.h b/include/asm-sparc64/dma-mapping.h deleted file mode 100644 index 380b7b63147f..000000000000 --- a/include/asm-sparc64/dma-mapping.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/dma-mapping.h> diff --git a/include/asm-sparc64/dma.h b/include/asm-sparc64/dma.h deleted file mode 100644 index 2e36248e6b59..000000000000 --- a/include/asm-sparc64/dma.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/dma.h> diff --git a/include/asm-sparc64/ebus.h b/include/asm-sparc64/ebus.h deleted file mode 100644 index d7d476158bd5..000000000000 --- a/include/asm-sparc64/ebus.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/ebus.h> diff --git a/include/asm-sparc64/elf.h b/include/asm-sparc64/elf.h deleted file mode 100644 index f256d9472c82..000000000000 --- a/include/asm-sparc64/elf.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/elf.h> diff --git a/include/asm-sparc64/emergency-restart.h b/include/asm-sparc64/emergency-restart.h deleted file mode 100644 index 2cac7b644da8..000000000000 --- a/include/asm-sparc64/emergency-restart.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/emergency-restart.h> diff --git a/include/asm-sparc64/envctrl.h b/include/asm-sparc64/envctrl.h deleted file mode 100644 index a2cc0ca334ba..000000000000 --- a/include/asm-sparc64/envctrl.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/envctrl.h> diff --git a/include/asm-sparc64/errno.h b/include/asm-sparc64/errno.h deleted file mode 100644 index 9701fe01cc53..000000000000 --- a/include/asm-sparc64/errno.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/errno.h> diff --git a/include/asm-sparc64/estate.h b/include/asm-sparc64/estate.h deleted file mode 100644 index bedd0ef5f19c..000000000000 --- a/include/asm-sparc64/estate.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/estate.h> diff --git a/include/asm-sparc64/fb.h b/include/asm-sparc64/fb.h deleted file mode 100644 index 1c2ac5832f39..000000000000 --- a/include/asm-sparc64/fb.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/fb.h> diff --git a/include/asm-sparc64/fbio.h b/include/asm-sparc64/fbio.h deleted file mode 100644 index c17edf8c7bc4..000000000000 --- a/include/asm-sparc64/fbio.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/fbio.h> diff --git a/include/asm-sparc64/fcntl.h b/include/asm-sparc64/fcntl.h deleted file mode 100644 index 8b1beae48cd1..000000000000 --- a/include/asm-sparc64/fcntl.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/fcntl.h> diff --git a/include/asm-sparc64/fhc.h b/include/asm-sparc64/fhc.h deleted file mode 100644 index 73eb04c19c47..000000000000 --- a/include/asm-sparc64/fhc.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/fhc.h> diff --git a/include/asm-sparc64/floppy.h b/include/asm-sparc64/floppy.h deleted file mode 100644 index 214878114436..000000000000 --- a/include/asm-sparc64/floppy.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/floppy.h> diff --git a/include/asm-sparc64/fpumacro.h b/include/asm-sparc64/fpumacro.h deleted file mode 100644 index 30d6d0f68bc3..000000000000 --- a/include/asm-sparc64/fpumacro.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/fpumacro.h> diff --git a/include/asm-sparc64/futex.h b/include/asm-sparc64/futex.h deleted file mode 100644 index 1ceb0bb2fe53..000000000000 --- a/include/asm-sparc64/futex.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/futex.h> diff --git a/include/asm-sparc64/hardirq.h b/include/asm-sparc64/hardirq.h deleted file mode 100644 index 63dca3db11f3..000000000000 --- a/include/asm-sparc64/hardirq.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/hardirq.h> diff --git a/include/asm-sparc64/head.h b/include/asm-sparc64/head.h deleted file mode 100644 index 2254c09e53f9..000000000000 --- a/include/asm-sparc64/head.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/head.h> diff --git a/include/asm-sparc64/hugetlb.h b/include/asm-sparc64/hugetlb.h deleted file mode 100644 index 21d8f0a9c243..000000000000 --- a/include/asm-sparc64/hugetlb.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/hugetlb.h> diff --git a/include/asm-sparc64/hvtramp.h b/include/asm-sparc64/hvtramp.h deleted file mode 100644 index fb46bfe934a7..000000000000 --- a/include/asm-sparc64/hvtramp.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/hvtramp.h> diff --git a/include/asm-sparc64/hw_irq.h b/include/asm-sparc64/hw_irq.h deleted file mode 100644 index 16920a291f51..000000000000 --- a/include/asm-sparc64/hw_irq.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/hw_irq.h> diff --git a/include/asm-sparc64/hypervisor.h b/include/asm-sparc64/hypervisor.h deleted file mode 100644 index fe7e51a9e429..000000000000 --- a/include/asm-sparc64/hypervisor.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/hypervisor.h> diff --git a/include/asm-sparc64/ide.h b/include/asm-sparc64/ide.h deleted file mode 100644 index 7125317a428d..000000000000 --- a/include/asm-sparc64/ide.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/ide.h> diff --git a/include/asm-sparc64/idprom.h b/include/asm-sparc64/idprom.h deleted file mode 100644 index c22f9c30bc78..000000000000 --- a/include/asm-sparc64/idprom.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/idprom.h> diff --git a/include/asm-sparc64/intr_queue.h b/include/asm-sparc64/intr_queue.h deleted file mode 100644 index f7225015b3db..000000000000 --- a/include/asm-sparc64/intr_queue.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/intr_queue.h> diff --git a/include/asm-sparc64/io.h b/include/asm-sparc64/io.h deleted file mode 100644 index 25ff258dfd33..000000000000 --- a/include/asm-sparc64/io.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/io.h> diff --git a/include/asm-sparc64/ioctl.h b/include/asm-sparc64/ioctl.h deleted file mode 100644 index 18fc5623ff51..000000000000 --- a/include/asm-sparc64/ioctl.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/ioctl.h> diff --git a/include/asm-sparc64/ioctls.h b/include/asm-sparc64/ioctls.h deleted file mode 100644 index dcd5540ec103..000000000000 --- a/include/asm-sparc64/ioctls.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/ioctls.h> diff --git a/include/asm-sparc64/iommu.h b/include/asm-sparc64/iommu.h deleted file mode 100644 index 76252bb85e97..000000000000 --- a/include/asm-sparc64/iommu.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/iommu.h> diff --git a/include/asm-sparc64/ipcbuf.h b/include/asm-sparc64/ipcbuf.h deleted file mode 100644 index 41dfaf1149b5..000000000000 --- a/include/asm-sparc64/ipcbuf.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/ipcbuf.h> diff --git a/include/asm-sparc64/irq.h b/include/asm-sparc64/irq.h deleted file mode 100644 index b2102e65947c..000000000000 --- a/include/asm-sparc64/irq.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/irq.h> diff --git a/include/asm-sparc64/irq_regs.h b/include/asm-sparc64/irq_regs.h deleted file mode 100644 index 1e2b8a1e745a..000000000000 --- a/include/asm-sparc64/irq_regs.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/irq_regs.h> diff --git a/include/asm-sparc64/irqflags.h b/include/asm-sparc64/irqflags.h deleted file mode 100644 index 27b091fc3fa0..000000000000 --- a/include/asm-sparc64/irqflags.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/irqflags.h> diff --git a/include/asm-sparc64/kdebug.h b/include/asm-sparc64/kdebug.h deleted file mode 100644 index 78cfd5d2749b..000000000000 --- a/include/asm-sparc64/kdebug.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/kdebug.h> diff --git a/include/asm-sparc64/kgdb.h b/include/asm-sparc64/kgdb.h deleted file mode 100644 index aa6532fd3a13..000000000000 --- a/include/asm-sparc64/kgdb.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/kgdb.h> diff --git a/include/asm-sparc64/kmap_types.h b/include/asm-sparc64/kmap_types.h deleted file mode 100644 index 276530cf5395..000000000000 --- a/include/asm-sparc64/kmap_types.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/kmap_types.h> diff --git a/include/asm-sparc64/kprobes.h b/include/asm-sparc64/kprobes.h deleted file mode 100644 index c55e43e4d2a4..000000000000 --- a/include/asm-sparc64/kprobes.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/kprobes.h> diff --git a/include/asm-sparc64/ldc.h b/include/asm-sparc64/ldc.h deleted file mode 100644 index 40f3f231c457..000000000000 --- a/include/asm-sparc64/ldc.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/ldc.h> diff --git a/include/asm-sparc64/linkage.h b/include/asm-sparc64/linkage.h deleted file mode 100644 index 3ea4fd13f193..000000000000 --- a/include/asm-sparc64/linkage.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/linkage.h> diff --git a/include/asm-sparc64/lmb.h b/include/asm-sparc64/lmb.h deleted file mode 100644 index 3d04981701e2..000000000000 --- a/include/asm-sparc64/lmb.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/lmb.h> diff --git a/include/asm-sparc64/local.h b/include/asm-sparc64/local.h deleted file mode 100644 index c11c530f74d0..000000000000 --- a/include/asm-sparc64/local.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/local.h> diff --git a/include/asm-sparc64/lsu.h b/include/asm-sparc64/lsu.h deleted file mode 100644 index 4e3d8b128a58..000000000000 --- a/include/asm-sparc64/lsu.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/lsu.h> diff --git a/include/asm-sparc64/mc146818rtc.h b/include/asm-sparc64/mc146818rtc.h deleted file mode 100644 index 97842e6ed1c2..000000000000 --- a/include/asm-sparc64/mc146818rtc.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/mc146818rtc.h> diff --git a/include/asm-sparc64/mdesc.h b/include/asm-sparc64/mdesc.h deleted file mode 100644 index 165a19347286..000000000000 --- a/include/asm-sparc64/mdesc.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/mdesc.h> diff --git a/include/asm-sparc64/mman.h b/include/asm-sparc64/mman.h deleted file mode 100644 index 17ddb1724f51..000000000000 --- a/include/asm-sparc64/mman.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/mman.h> diff --git a/include/asm-sparc64/mmu.h b/include/asm-sparc64/mmu.h deleted file mode 100644 index e677a64d8db1..000000000000 --- a/include/asm-sparc64/mmu.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/mmu.h> diff --git a/include/asm-sparc64/mmu_context.h b/include/asm-sparc64/mmu_context.h deleted file mode 100644 index 877fee94bd4e..000000000000 --- a/include/asm-sparc64/mmu_context.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/mmu_context.h> diff --git a/include/asm-sparc64/mmzone.h b/include/asm-sparc64/mmzone.h deleted file mode 100644 index 43a710f7892a..000000000000 --- a/include/asm-sparc64/mmzone.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/mmzone.h> diff --git a/include/asm-sparc64/module.h b/include/asm-sparc64/module.h deleted file mode 100644 index a9606db55e4a..000000000000 --- a/include/asm-sparc64/module.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/module.h> diff --git a/include/asm-sparc64/mostek.h b/include/asm-sparc64/mostek.h deleted file mode 100644 index 95a752f7e875..000000000000 --- a/include/asm-sparc64/mostek.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/mostek.h> diff --git a/include/asm-sparc64/msgbuf.h b/include/asm-sparc64/msgbuf.h deleted file mode 100644 index 5b33cc9d9bfb..000000000000 --- a/include/asm-sparc64/msgbuf.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/msgbuf.h> diff --git a/include/asm-sparc64/mutex.h b/include/asm-sparc64/mutex.h deleted file mode 100644 index c0c0f8f260d6..000000000000 --- a/include/asm-sparc64/mutex.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/mutex.h> diff --git a/include/asm-sparc64/ns87303.h b/include/asm-sparc64/ns87303.h deleted file mode 100644 index 5f369d4df3db..000000000000 --- a/include/asm-sparc64/ns87303.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/ns87303.h> diff --git a/include/asm-sparc64/of_device.h b/include/asm-sparc64/of_device.h deleted file mode 100644 index a769fdbe164a..000000000000 --- a/include/asm-sparc64/of_device.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/of_device.h> diff --git a/include/asm-sparc64/of_platform.h b/include/asm-sparc64/of_platform.h deleted file mode 100644 index f7c427b8bc61..000000000000 --- a/include/asm-sparc64/of_platform.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/of_platform.h> diff --git a/include/asm-sparc64/openprom.h b/include/asm-sparc64/openprom.h deleted file mode 100644 index acf4b234fae3..000000000000 --- a/include/asm-sparc64/openprom.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/openprom.h> diff --git a/include/asm-sparc64/openpromio.h b/include/asm-sparc64/openpromio.h deleted file mode 100644 index 122fabda21f1..000000000000 --- a/include/asm-sparc64/openpromio.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/openpromio.h> diff --git a/include/asm-sparc64/oplib.h b/include/asm-sparc64/oplib.h deleted file mode 100644 index d93e44e63510..000000000000 --- a/include/asm-sparc64/oplib.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/oplib.h> diff --git a/include/asm-sparc64/page.h b/include/asm-sparc64/page.h deleted file mode 100644 index f46c1fb53028..000000000000 --- a/include/asm-sparc64/page.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/page.h> diff --git a/include/asm-sparc64/param.h b/include/asm-sparc64/param.h deleted file mode 100644 index 40c6dc110822..000000000000 --- a/include/asm-sparc64/param.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/param.h> diff --git a/include/asm-sparc64/parport.h b/include/asm-sparc64/parport.h deleted file mode 100644 index b4e4ca812eb6..000000000000 --- a/include/asm-sparc64/parport.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/parport.h> diff --git a/include/asm-sparc64/pci.h b/include/asm-sparc64/pci.h deleted file mode 100644 index da54c4d1f39c..000000000000 --- a/include/asm-sparc64/pci.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/pci.h> diff --git a/include/asm-sparc64/percpu.h b/include/asm-sparc64/percpu.h deleted file mode 100644 index 292729bb350f..000000000000 --- a/include/asm-sparc64/percpu.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/percpu.h> diff --git a/include/asm-sparc64/perfctr.h b/include/asm-sparc64/perfctr.h deleted file mode 100644 index 52073a9f8e30..000000000000 --- a/include/asm-sparc64/perfctr.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/perfctr.h> diff --git a/include/asm-sparc64/pgalloc.h b/include/asm-sparc64/pgalloc.h deleted file mode 100644 index bec31641011c..000000000000 --- a/include/asm-sparc64/pgalloc.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/pgalloc.h> diff --git a/include/asm-sparc64/pgtable.h b/include/asm-sparc64/pgtable.h deleted file mode 100644 index 9decbd99aeff..000000000000 --- a/include/asm-sparc64/pgtable.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/pgtable.h> diff --git a/include/asm-sparc64/pil.h b/include/asm-sparc64/pil.h deleted file mode 100644 index d805f33f1e0f..000000000000 --- a/include/asm-sparc64/pil.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/pil.h> diff --git a/include/asm-sparc64/poll.h b/include/asm-sparc64/poll.h deleted file mode 100644 index 8e2f31b4641a..000000000000 --- a/include/asm-sparc64/poll.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/poll.h> diff --git a/include/asm-sparc64/posix_types.h b/include/asm-sparc64/posix_types.h deleted file mode 100644 index 8cee99200232..000000000000 --- a/include/asm-sparc64/posix_types.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/posix_types.h> diff --git a/include/asm-sparc64/processor.h b/include/asm-sparc64/processor.h deleted file mode 100644 index 21de6cc182eb..000000000000 --- a/include/asm-sparc64/processor.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/processor.h> diff --git a/include/asm-sparc64/prom.h b/include/asm-sparc64/prom.h deleted file mode 100644 index 5fa166ee3ffa..000000000000 --- a/include/asm-sparc64/prom.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/prom.h> diff --git a/include/asm-sparc64/psrcompat.h b/include/asm-sparc64/psrcompat.h deleted file mode 100644 index 587846f48358..000000000000 --- a/include/asm-sparc64/psrcompat.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/psrcompat.h> diff --git a/include/asm-sparc64/pstate.h b/include/asm-sparc64/pstate.h deleted file mode 100644 index 3ccf0be25360..000000000000 --- a/include/asm-sparc64/pstate.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/pstate.h> diff --git a/include/asm-sparc64/ptrace.h b/include/asm-sparc64/ptrace.h deleted file mode 100644 index 1a55b9fb3b0c..000000000000 --- a/include/asm-sparc64/ptrace.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/ptrace.h> diff --git a/include/asm-sparc64/reboot.h b/include/asm-sparc64/reboot.h deleted file mode 100644 index 0d72eb811cc8..000000000000 --- a/include/asm-sparc64/reboot.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/reboot.h> diff --git a/include/asm-sparc64/reg.h b/include/asm-sparc64/reg.h deleted file mode 100644 index 495bab27da07..000000000000 --- a/include/asm-sparc64/reg.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/reg.h> diff --git a/include/asm-sparc64/resource.h b/include/asm-sparc64/resource.h deleted file mode 100644 index 46e3bc0de476..000000000000 --- a/include/asm-sparc64/resource.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/resource.h> diff --git a/include/asm-sparc64/rtc.h b/include/asm-sparc64/rtc.h deleted file mode 100644 index e49a9685aead..000000000000 --- a/include/asm-sparc64/rtc.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/rtc.h> diff --git a/include/asm-sparc64/rwsem-const.h b/include/asm-sparc64/rwsem-const.h deleted file mode 100644 index 2a1de315c86a..000000000000 --- a/include/asm-sparc64/rwsem-const.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/rwsem-const.h> diff --git a/include/asm-sparc64/rwsem.h b/include/asm-sparc64/rwsem.h deleted file mode 100644 index 6943c56ed087..000000000000 --- a/include/asm-sparc64/rwsem.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/rwsem.h> diff --git a/include/asm-sparc64/sbus.h b/include/asm-sparc64/sbus.h deleted file mode 100644 index 0cab0e89b874..000000000000 --- a/include/asm-sparc64/sbus.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/sbus.h> diff --git a/include/asm-sparc64/scatterlist.h b/include/asm-sparc64/scatterlist.h deleted file mode 100644 index b7fef95953ca..000000000000 --- a/include/asm-sparc64/scatterlist.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/scatterlist.h> diff --git a/include/asm-sparc64/scratchpad.h b/include/asm-sparc64/scratchpad.h deleted file mode 100644 index 23675f6a915a..000000000000 --- a/include/asm-sparc64/scratchpad.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/scratchpad.h> diff --git a/include/asm-sparc64/seccomp.h b/include/asm-sparc64/seccomp.h deleted file mode 100644 index f22f02a08a61..000000000000 --- a/include/asm-sparc64/seccomp.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/seccomp.h> diff --git a/include/asm-sparc64/sections.h b/include/asm-sparc64/sections.h deleted file mode 100644 index 721496f8b2be..000000000000 --- a/include/asm-sparc64/sections.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/sections.h> diff --git a/include/asm-sparc64/sembuf.h b/include/asm-sparc64/sembuf.h deleted file mode 100644 index c55b95214136..000000000000 --- a/include/asm-sparc64/sembuf.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/sembuf.h> diff --git a/include/asm-sparc64/setup.h b/include/asm-sparc64/setup.h deleted file mode 100644 index 7143d06b2c55..000000000000 --- a/include/asm-sparc64/setup.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/setup.h> diff --git a/include/asm-sparc64/sfafsr.h b/include/asm-sparc64/sfafsr.h deleted file mode 100644 index 8036fc377a4d..000000000000 --- a/include/asm-sparc64/sfafsr.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/sfafsr.h> diff --git a/include/asm-sparc64/sfp-machine.h b/include/asm-sparc64/sfp-machine.h deleted file mode 100644 index 7bbc4fecdc7d..000000000000 --- a/include/asm-sparc64/sfp-machine.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/sfp-machine.h> diff --git a/include/asm-sparc64/shmbuf.h b/include/asm-sparc64/shmbuf.h deleted file mode 100644 index 0c54a2d68681..000000000000 --- a/include/asm-sparc64/shmbuf.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/shmbuf.h> diff --git a/include/asm-sparc64/shmparam.h b/include/asm-sparc64/shmparam.h deleted file mode 100644 index 5fa3a9b05e7f..000000000000 --- a/include/asm-sparc64/shmparam.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/shmparam.h> diff --git a/include/asm-sparc64/sigcontext.h b/include/asm-sparc64/sigcontext.h deleted file mode 100644 index 5b16dcce44f2..000000000000 --- a/include/asm-sparc64/sigcontext.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/sigcontext.h> diff --git a/include/asm-sparc64/siginfo.h b/include/asm-sparc64/siginfo.h deleted file mode 100644 index 8ffd6ebabc7a..000000000000 --- a/include/asm-sparc64/siginfo.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/siginfo.h> diff --git a/include/asm-sparc64/signal.h b/include/asm-sparc64/signal.h deleted file mode 100644 index 79705e5d49c3..000000000000 --- a/include/asm-sparc64/signal.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/signal.h> diff --git a/include/asm-sparc64/smp.h b/include/asm-sparc64/smp.h deleted file mode 100644 index 5095a2cbea52..000000000000 --- a/include/asm-sparc64/smp.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/smp.h> diff --git a/include/asm-sparc64/socket.h b/include/asm-sparc64/socket.h deleted file mode 100644 index 13e0d5d94bb3..000000000000 --- a/include/asm-sparc64/socket.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/socket.h> diff --git a/include/asm-sparc64/sockios.h b/include/asm-sparc64/sockios.h deleted file mode 100644 index 2cb4b641482c..000000000000 --- a/include/asm-sparc64/sockios.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/sockios.h> diff --git a/include/asm-sparc64/sparsemem.h b/include/asm-sparc64/sparsemem.h deleted file mode 100644 index e681f22a97ae..000000000000 --- a/include/asm-sparc64/sparsemem.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/sparsemem.h> diff --git a/include/asm-sparc64/spinlock.h b/include/asm-sparc64/spinlock.h deleted file mode 100644 index 0115b8156eb8..000000000000 --- a/include/asm-sparc64/spinlock.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/spinlock.h> diff --git a/include/asm-sparc64/spinlock_types.h b/include/asm-sparc64/spinlock_types.h deleted file mode 100644 index 48d81c8734b5..000000000000 --- a/include/asm-sparc64/spinlock_types.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/spinlock_types.h> diff --git a/include/asm-sparc64/spitfire.h b/include/asm-sparc64/spitfire.h deleted file mode 100644 index 4430d2fbb0dc..000000000000 --- a/include/asm-sparc64/spitfire.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/spitfire.h> diff --git a/include/asm-sparc64/sstate.h b/include/asm-sparc64/sstate.h deleted file mode 100644 index 97720ce2fd43..000000000000 --- a/include/asm-sparc64/sstate.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/sstate.h> diff --git a/include/asm-sparc64/stacktrace.h b/include/asm-sparc64/stacktrace.h deleted file mode 100644 index adc9b92c0ef1..000000000000 --- a/include/asm-sparc64/stacktrace.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/stacktrace.h> diff --git a/include/asm-sparc64/starfire.h b/include/asm-sparc64/starfire.h deleted file mode 100644 index db97daa3bed4..000000000000 --- a/include/asm-sparc64/starfire.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/starfire.h> diff --git a/include/asm-sparc64/stat.h b/include/asm-sparc64/stat.h deleted file mode 100644 index b108a866256b..000000000000 --- a/include/asm-sparc64/stat.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/stat.h> diff --git a/include/asm-sparc64/statfs.h b/include/asm-sparc64/statfs.h deleted file mode 100644 index 5503d6a4c67e..000000000000 --- a/include/asm-sparc64/statfs.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/statfs.h> diff --git a/include/asm-sparc64/string.h b/include/asm-sparc64/string.h deleted file mode 100644 index 5018cd8b6ad0..000000000000 --- a/include/asm-sparc64/string.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/string.h> diff --git a/include/asm-sparc64/sunbpp.h b/include/asm-sparc64/sunbpp.h deleted file mode 100644 index 9632be290eb5..000000000000 --- a/include/asm-sparc64/sunbpp.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/sunbpp.h> diff --git a/include/asm-sparc64/syscalls.h b/include/asm-sparc64/syscalls.h deleted file mode 100644 index 3477b16e30ca..000000000000 --- a/include/asm-sparc64/syscalls.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/syscalls.h> diff --git a/include/asm-sparc64/system.h b/include/asm-sparc64/system.h deleted file mode 100644 index be2603c2e527..000000000000 --- a/include/asm-sparc64/system.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/system.h> diff --git a/include/asm-sparc64/termbits.h b/include/asm-sparc64/termbits.h deleted file mode 100644 index e03f97592c70..000000000000 --- a/include/asm-sparc64/termbits.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/termbits.h> diff --git a/include/asm-sparc64/termios.h b/include/asm-sparc64/termios.h deleted file mode 100644 index 940495eb05cc..000000000000 --- a/include/asm-sparc64/termios.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/termios.h> diff --git a/include/asm-sparc64/thread_info.h b/include/asm-sparc64/thread_info.h deleted file mode 100644 index 92bed7913395..000000000000 --- a/include/asm-sparc64/thread_info.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/thread_info.h> diff --git a/include/asm-sparc64/timer.h b/include/asm-sparc64/timer.h deleted file mode 100644 index 88026d83cc93..000000000000 --- a/include/asm-sparc64/timer.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/timer.h> diff --git a/include/asm-sparc64/timex.h b/include/asm-sparc64/timex.h deleted file mode 100644 index 8dd59ee24b48..000000000000 --- a/include/asm-sparc64/timex.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/timex.h> diff --git a/include/asm-sparc64/tlb.h b/include/asm-sparc64/tlb.h deleted file mode 100644 index ae92fce10936..000000000000 --- a/include/asm-sparc64/tlb.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/tlb.h> diff --git a/include/asm-sparc64/tlbflush.h b/include/asm-sparc64/tlbflush.h deleted file mode 100644 index a43979a06cd9..000000000000 --- a/include/asm-sparc64/tlbflush.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/tlbflush.h> diff --git a/include/asm-sparc64/topology.h b/include/asm-sparc64/topology.h deleted file mode 100644 index 46999b60fbba..000000000000 --- a/include/asm-sparc64/topology.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/topology.h> diff --git a/include/asm-sparc64/tsb.h b/include/asm-sparc64/tsb.h deleted file mode 100644 index 3677a302ea3e..000000000000 --- a/include/asm-sparc64/tsb.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/tsb.h> diff --git a/include/asm-sparc64/ttable.h b/include/asm-sparc64/ttable.h deleted file mode 100644 index a550f1bf6f9b..000000000000 --- a/include/asm-sparc64/ttable.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/ttable.h> diff --git a/include/asm-sparc64/types.h b/include/asm-sparc64/types.h deleted file mode 100644 index cfbfad5043eb..000000000000 --- a/include/asm-sparc64/types.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/types.h> diff --git a/include/asm-sparc64/uaccess.h b/include/asm-sparc64/uaccess.h deleted file mode 100644 index 2872d22844f3..000000000000 --- a/include/asm-sparc64/uaccess.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/uaccess.h> diff --git a/include/asm-sparc64/uctx.h b/include/asm-sparc64/uctx.h deleted file mode 100644 index 9e1b5794b07f..000000000000 --- a/include/asm-sparc64/uctx.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/uctx.h> diff --git a/include/asm-sparc64/unaligned.h b/include/asm-sparc64/unaligned.h deleted file mode 100644 index 19fbf9508acf..000000000000 --- a/include/asm-sparc64/unaligned.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/unaligned.h> diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h deleted file mode 100644 index ad86e0b7a455..000000000000 --- a/include/asm-sparc64/unistd.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/unistd.h> diff --git a/include/asm-sparc64/upa.h b/include/asm-sparc64/upa.h deleted file mode 100644 index aab72930815a..000000000000 --- a/include/asm-sparc64/upa.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/upa.h> diff --git a/include/asm-sparc64/user.h b/include/asm-sparc64/user.h deleted file mode 100644 index 29fc6e906c29..000000000000 --- a/include/asm-sparc64/user.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/user.h> diff --git a/include/asm-sparc64/utrap.h b/include/asm-sparc64/utrap.h deleted file mode 100644 index b030a41f1895..000000000000 --- a/include/asm-sparc64/utrap.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/utrap.h> diff --git a/include/asm-sparc64/vga.h b/include/asm-sparc64/vga.h deleted file mode 100644 index fbf4d58a56f0..000000000000 --- a/include/asm-sparc64/vga.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/vga.h> diff --git a/include/asm-sparc64/vio.h b/include/asm-sparc64/vio.h deleted file mode 100644 index 299b26ab81a7..000000000000 --- a/include/asm-sparc64/vio.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/vio.h> diff --git a/include/asm-sparc64/visasm.h b/include/asm-sparc64/visasm.h deleted file mode 100644 index 837a12278f4a..000000000000 --- a/include/asm-sparc64/visasm.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/visasm.h> diff --git a/include/asm-sparc64/watchdog.h b/include/asm-sparc64/watchdog.h deleted file mode 100644 index b0f2857145f7..000000000000 --- a/include/asm-sparc64/watchdog.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/watchdog.h> diff --git a/include/asm-sparc64/xor.h b/include/asm-sparc64/xor.h deleted file mode 100644 index ef187cc07ed5..000000000000 --- a/include/asm-sparc64/xor.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/xor.h> |