diff --git a/Makefile b/Makefile index 40f24810116ccfcf9fe775b03c0fd58eef5fe905..baee3d414754f0b2c169ebd73d2876a8ad94d0c1 100644 --- a/Makefile +++ b/Makefile @@ -206,7 +206,11 @@ ifeq ($(ARCH),x86_64) endif # Where to locate arch specific headers -hdr-arch := $(SRCARCH) +ifeq ($(ARCH),sparc64) + hdr-arch := sparc +else + hdr-arch := $(SRCARCH) +endif KCONFIG_CONFIG ?= .config diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 375de7c6d082b09547fd285bc647441e02fec89d..a214002114ed90b0f8924c6837cbfcc622af737c 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 0000000000000000000000000000000000000000..a5f0ce734ff7dab790fe2df8e0c1915e2327c6f3 --- /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 similarity index 100% rename from include/asm-sparc/agp.h rename to arch/sparc/include/asm/agp.h diff --git a/include/asm-sparc/apb.h b/arch/sparc/include/asm/apb.h similarity index 100% rename from include/asm-sparc/apb.h rename to arch/sparc/include/asm/apb.h diff --git a/include/asm-sparc/apc.h b/arch/sparc/include/asm/apc.h similarity index 100% rename from include/asm-sparc/apc.h rename to arch/sparc/include/asm/apc.h diff --git a/include/asm-sparc/asi.h b/arch/sparc/include/asm/asi.h similarity index 100% rename from include/asm-sparc/asi.h rename to arch/sparc/include/asm/asi.h diff --git a/include/asm-sparc/asmmacro.h b/arch/sparc/include/asm/asmmacro.h similarity index 100% rename from include/asm-sparc/asmmacro.h rename to arch/sparc/include/asm/asmmacro.h diff --git a/include/asm-sparc/atomic.h b/arch/sparc/include/asm/atomic.h similarity index 65% rename from include/asm-sparc/atomic.h rename to arch/sparc/include/asm/atomic.h index 66d8166ec1d7d768e321b7fe06414140ac7d7bf6..8ff83d8cc33fd7f4abd2f7ae2b018baa1006cdd7 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/atomic_32.h b/arch/sparc/include/asm/atomic_32.h similarity index 100% rename from include/asm-sparc/atomic_32.h rename to arch/sparc/include/asm/atomic_32.h diff --git a/include/asm-sparc/atomic_64.h b/arch/sparc/include/asm/atomic_64.h similarity index 100% rename from include/asm-sparc/atomic_64.h rename to arch/sparc/include/asm/atomic_64.h diff --git a/include/asm-sparc/auxio.h b/arch/sparc/include/asm/auxio.h similarity index 65% rename from include/asm-sparc/auxio.h rename to arch/sparc/include/asm/auxio.h index 24c6f3c0f5779c5ea9d2789ae8b91017f2ab97e3..13dc67f03011eae7624c26957cf4f6a5085a4c34 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/auxio_32.h b/arch/sparc/include/asm/auxio_32.h similarity index 97% rename from include/asm-sparc/auxio_32.h rename to arch/sparc/include/asm/auxio_32.h index 4db8f23db20f1c930c96354f529657525dced95f..e03e088be95f23eb2b01a1ab2915a22e47beb7dd 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 similarity index 100% rename from include/asm-sparc/auxio_64.h rename to arch/sparc/include/asm/auxio_64.h diff --git a/include/asm-sparc/auxvec.h b/arch/sparc/include/asm/auxvec.h similarity index 100% rename from include/asm-sparc/auxvec.h rename to arch/sparc/include/asm/auxvec.h diff --git a/include/asm-sparc/backoff.h b/arch/sparc/include/asm/backoff.h similarity index 100% rename from include/asm-sparc/backoff.h rename to arch/sparc/include/asm/backoff.h diff --git a/include/asm-sparc/bbc.h b/arch/sparc/include/asm/bbc.h similarity index 100% rename from include/asm-sparc/bbc.h rename to arch/sparc/include/asm/bbc.h diff --git a/include/asm-sparc/bitext.h b/arch/sparc/include/asm/bitext.h similarity index 100% rename from include/asm-sparc/bitext.h rename to arch/sparc/include/asm/bitext.h diff --git a/include/asm-sparc/bitops.h b/arch/sparc/include/asm/bitops.h similarity index 65% rename from include/asm-sparc/bitops.h rename to arch/sparc/include/asm/bitops.h index 1a2949d0193fa85defd4a7a2698bf4afb372b7cf..b1edd94bd64f398d6363132519ab995cc549c452 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/bitops_32.h b/arch/sparc/include/asm/bitops_32.h similarity index 100% rename from include/asm-sparc/bitops_32.h rename to arch/sparc/include/asm/bitops_32.h diff --git a/include/asm-sparc/bitops_64.h b/arch/sparc/include/asm/bitops_64.h similarity index 100% rename from include/asm-sparc/bitops_64.h rename to arch/sparc/include/asm/bitops_64.h diff --git a/include/asm-sparc/bpp.h b/arch/sparc/include/asm/bpp.h similarity index 100% rename from include/asm-sparc/bpp.h rename to arch/sparc/include/asm/bpp.h diff --git a/include/asm-sparc/btfixup.h b/arch/sparc/include/asm/btfixup.h similarity index 99% rename from include/asm-sparc/btfixup.h rename to arch/sparc/include/asm/btfixup.h index 08277e6fb4cd51dcc5a5349c782d70ab4ba07361..797722cf69f2869943f4d347a4acb6ad9f72bb77 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 similarity index 100% rename from include/asm-sparc/bug.h rename to arch/sparc/include/asm/bug.h diff --git a/include/asm-sparc/bugs.h b/arch/sparc/include/asm/bugs.h similarity index 87% rename from include/asm-sparc/bugs.h rename to arch/sparc/include/asm/bugs.h index 2dfc07bc8e5472ec9b319dd137a8c7a69535338e..e179bc12f64a478ff9d3eaba6bf337f1a27b1539 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 similarity index 100% rename from include/asm-sparc/byteorder.h rename to arch/sparc/include/asm/byteorder.h diff --git a/include/asm-sparc/cache.h b/arch/sparc/include/asm/cache.h similarity index 100% rename from include/asm-sparc/cache.h rename to arch/sparc/include/asm/cache.h diff --git a/include/asm-sparc/cacheflush.h b/arch/sparc/include/asm/cacheflush.h similarity index 64% rename from include/asm-sparc/cacheflush.h rename to arch/sparc/include/asm/cacheflush.h index 2b6a37957c2da803739a7e0a71779ea264f2b5d4..049168087b198fd37e5a144bc55e7682ef1ffc6f 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/cacheflush_32.h b/arch/sparc/include/asm/cacheflush_32.h similarity index 100% rename from include/asm-sparc/cacheflush_32.h rename to arch/sparc/include/asm/cacheflush_32.h diff --git a/include/asm-sparc/cacheflush_64.h b/arch/sparc/include/asm/cacheflush_64.h similarity index 100% rename from include/asm-sparc/cacheflush_64.h rename to arch/sparc/include/asm/cacheflush_64.h diff --git a/include/asm-sparc/chafsr.h b/arch/sparc/include/asm/chafsr.h similarity index 100% rename from include/asm-sparc/chafsr.h rename to arch/sparc/include/asm/chafsr.h diff --git a/include/asm-sparc/checksum.h b/arch/sparc/include/asm/checksum.h similarity index 65% rename from include/asm-sparc/checksum.h rename to arch/sparc/include/asm/checksum.h index 4e3553d4f6e17a3eb6c07be765b1fe08b4542604..7ac0d7497bc593bbc6c87f69964073cbcd8d1d14 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/checksum_32.h b/arch/sparc/include/asm/checksum_32.h similarity index 100% rename from include/asm-sparc/checksum_32.h rename to arch/sparc/include/asm/checksum_32.h diff --git a/include/asm-sparc/checksum_64.h b/arch/sparc/include/asm/checksum_64.h similarity index 100% rename from include/asm-sparc/checksum_64.h rename to arch/sparc/include/asm/checksum_64.h diff --git a/include/asm-sparc/chmctrl.h b/arch/sparc/include/asm/chmctrl.h similarity index 100% rename from include/asm-sparc/chmctrl.h rename to arch/sparc/include/asm/chmctrl.h diff --git a/include/asm-sparc/clock.h b/arch/sparc/include/asm/clock.h similarity index 100% rename from include/asm-sparc/clock.h rename to arch/sparc/include/asm/clock.h diff --git a/include/asm-sparc/cmt.h b/arch/sparc/include/asm/cmt.h similarity index 100% rename from include/asm-sparc/cmt.h rename to arch/sparc/include/asm/cmt.h diff --git a/include/asm-sparc/compat.h b/arch/sparc/include/asm/compat.h similarity index 100% rename from include/asm-sparc/compat.h rename to arch/sparc/include/asm/compat.h diff --git a/include/asm-sparc/compat_signal.h b/arch/sparc/include/asm/compat_signal.h similarity index 100% rename from include/asm-sparc/compat_signal.h rename to arch/sparc/include/asm/compat_signal.h diff --git a/include/asm-sparc/contregs.h b/arch/sparc/include/asm/contregs.h similarity index 100% rename from include/asm-sparc/contregs.h rename to arch/sparc/include/asm/contregs.h diff --git a/include/asm-sparc/cpudata.h b/arch/sparc/include/asm/cpudata.h similarity index 65% rename from include/asm-sparc/cpudata.h rename to arch/sparc/include/asm/cpudata.h index b76fac0c8d8feb549fcb7d43c9e18ebdb7449933..b5976de7cacdb32528f576eef418ce4d35685e4e 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/cpudata_32.h b/arch/sparc/include/asm/cpudata_32.h similarity index 89% rename from include/asm-sparc/cpudata_32.h rename to arch/sparc/include/asm/cpudata_32.h index a2c4d51d36c4c478f81dc0ba99a05a8809690137..31d48a0e32c7cd3cd3b4eda72325229496f00411 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 similarity index 100% rename from include/asm-sparc/cpudata_64.h rename to arch/sparc/include/asm/cpudata_64.h diff --git a/include/asm-sparc/cputime.h b/arch/sparc/include/asm/cputime.h similarity index 100% rename from include/asm-sparc/cputime.h rename to arch/sparc/include/asm/cputime.h diff --git a/include/asm-sparc/current.h b/arch/sparc/include/asm/current.h similarity index 96% rename from include/asm-sparc/current.h rename to arch/sparc/include/asm/current.h index 8a1d9d6643b059343919a615064fb0068246a2be..10a0df55a574aeb8758e57c99073ccf8cf4e2d54 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 similarity index 100% rename from include/asm-sparc/cypress.h rename to arch/sparc/include/asm/cypress.h diff --git a/include/asm-sparc/dcr.h b/arch/sparc/include/asm/dcr.h similarity index 100% rename from include/asm-sparc/dcr.h rename to arch/sparc/include/asm/dcr.h diff --git a/include/asm-sparc/dcu.h b/arch/sparc/include/asm/dcu.h similarity index 100% rename from include/asm-sparc/dcu.h rename to arch/sparc/include/asm/dcu.h diff --git a/include/asm-sparc/delay.h b/arch/sparc/include/asm/delay.h similarity index 65% rename from include/asm-sparc/delay.h rename to arch/sparc/include/asm/delay.h index 6210a3ce97517860de53a9b1823a4eaa5b56e871..467caa2a97a04199ec379aa1540a29c7fd62a49d 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/delay_32.h b/arch/sparc/include/asm/delay_32.h similarity index 100% rename from include/asm-sparc/delay_32.h rename to arch/sparc/include/asm/delay_32.h diff --git a/include/asm-sparc/delay_64.h b/arch/sparc/include/asm/delay_64.h similarity index 100% rename from include/asm-sparc/delay_64.h rename to arch/sparc/include/asm/delay_64.h diff --git a/include/asm-sparc/device.h b/arch/sparc/include/asm/device.h similarity index 100% rename from include/asm-sparc/device.h rename to arch/sparc/include/asm/device.h diff --git a/include/asm-sparc/display7seg.h b/arch/sparc/include/asm/display7seg.h similarity index 100% rename from include/asm-sparc/display7seg.h rename to arch/sparc/include/asm/display7seg.h diff --git a/include/asm-sparc/div64.h b/arch/sparc/include/asm/div64.h similarity index 100% rename from include/asm-sparc/div64.h rename to arch/sparc/include/asm/div64.h diff --git a/include/asm-sparc/dma-mapping.h b/arch/sparc/include/asm/dma-mapping.h similarity index 64% rename from include/asm-sparc/dma-mapping.h rename to arch/sparc/include/asm/dma-mapping.h index 7483504259cef140dd187a87af7025a18d689486..0f4150e26619c3a2063f92abe4ff95ca8dece6cc 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/dma-mapping_32.h b/arch/sparc/include/asm/dma-mapping_32.h similarity index 100% rename from include/asm-sparc/dma-mapping_32.h rename to 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 similarity index 100% rename from include/asm-sparc/dma-mapping_64.h rename to arch/sparc/include/asm/dma-mapping_64.h diff --git a/include/asm-sparc/dma.h b/arch/sparc/include/asm/dma.h similarity index 66% rename from include/asm-sparc/dma.h rename to arch/sparc/include/asm/dma.h index 8cc69bfaae2ab8459433dadaf6a10ce1e20eae65..aa1d90ac04c58b2db3c907ab8e5555aa7ae90b75 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/dma_32.h b/arch/sparc/include/asm/dma_32.h similarity index 99% rename from include/asm-sparc/dma_32.h rename to arch/sparc/include/asm/dma_32.h index 959d6c8a71ae72365f6d33e2c1921bebbe012317..cf7189c0079b2c3b6b46c02b65e53d70caddd506 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 similarity index 99% rename from include/asm-sparc/dma_64.h rename to arch/sparc/include/asm/dma_64.h index 9d4c024bd3b3874f0091c4c3e83cd4392006110f..46a8aecffc02c182b63cf794e83746ac64499674 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 similarity index 66% rename from include/asm-sparc/ebus.h rename to arch/sparc/include/asm/ebus.h index a5da2d00cd1814728af538bbca535919f2086cdd..83a6d16c22e68bd5c7f463fb13edc5a7e6af0949 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/ebus_32.h b/arch/sparc/include/asm/ebus_32.h similarity index 100% rename from include/asm-sparc/ebus_32.h rename to arch/sparc/include/asm/ebus_32.h diff --git a/include/asm-sparc/ebus_64.h b/arch/sparc/include/asm/ebus_64.h similarity index 100% rename from include/asm-sparc/ebus_64.h rename to arch/sparc/include/asm/ebus_64.h diff --git a/include/asm-sparc/ecc.h b/arch/sparc/include/asm/ecc.h similarity index 100% rename from include/asm-sparc/ecc.h rename to arch/sparc/include/asm/ecc.h diff --git a/include/asm-sparc/eeprom.h b/arch/sparc/include/asm/eeprom.h similarity index 100% rename from include/asm-sparc/eeprom.h rename to arch/sparc/include/asm/eeprom.h diff --git a/include/asm-sparc/elf.h b/arch/sparc/include/asm/elf.h similarity index 66% rename from include/asm-sparc/elf.h rename to arch/sparc/include/asm/elf.h index f035c45d7b5e3ee4f02fce36767775fd85083cb3..0a2816c50b07faa54c98a1b75798d4d192ddc2da 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/elf_32.h b/arch/sparc/include/asm/elf_32.h similarity index 100% rename from include/asm-sparc/elf_32.h rename to arch/sparc/include/asm/elf_32.h diff --git a/include/asm-sparc/elf_64.h b/arch/sparc/include/asm/elf_64.h similarity index 100% rename from include/asm-sparc/elf_64.h rename to arch/sparc/include/asm/elf_64.h diff --git a/include/asm-sparc/emergency-restart.h b/arch/sparc/include/asm/emergency-restart.h similarity index 100% rename from include/asm-sparc/emergency-restart.h rename to arch/sparc/include/asm/emergency-restart.h diff --git a/include/asm-sparc/envctrl.h b/arch/sparc/include/asm/envctrl.h similarity index 100% rename from include/asm-sparc/envctrl.h rename to arch/sparc/include/asm/envctrl.h diff --git a/include/asm-sparc/errno.h b/arch/sparc/include/asm/errno.h similarity index 100% rename from include/asm-sparc/errno.h rename to arch/sparc/include/asm/errno.h diff --git a/include/asm-sparc/estate.h b/arch/sparc/include/asm/estate.h similarity index 100% rename from include/asm-sparc/estate.h rename to arch/sparc/include/asm/estate.h diff --git a/include/asm-sparc/fb.h b/arch/sparc/include/asm/fb.h similarity index 100% rename from include/asm-sparc/fb.h rename to arch/sparc/include/asm/fb.h diff --git a/include/asm-sparc/fbio.h b/arch/sparc/include/asm/fbio.h similarity index 100% rename from include/asm-sparc/fbio.h rename to arch/sparc/include/asm/fbio.h diff --git a/include/asm-sparc/fcntl.h b/arch/sparc/include/asm/fcntl.h similarity index 100% rename from include/asm-sparc/fcntl.h rename to arch/sparc/include/asm/fcntl.h diff --git a/include/asm-sparc/fhc.h b/arch/sparc/include/asm/fhc.h similarity index 100% rename from include/asm-sparc/fhc.h rename to arch/sparc/include/asm/fhc.h diff --git a/include/asm-sparc/fixmap.h b/arch/sparc/include/asm/fixmap.h similarity index 100% rename from include/asm-sparc/fixmap.h rename to arch/sparc/include/asm/fixmap.h diff --git a/include/asm-sparc/floppy.h b/arch/sparc/include/asm/floppy.h similarity index 65% rename from include/asm-sparc/floppy.h rename to arch/sparc/include/asm/floppy.h index 6c628ba15a8d62ceaccb1e0124457435c478b445..faebd335b600647493ff6306f817220b23167af6 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/floppy_32.h b/arch/sparc/include/asm/floppy_32.h similarity index 99% rename from include/asm-sparc/floppy_32.h rename to arch/sparc/include/asm/floppy_32.h index acdd06eafe596c0c360264f44e6be4bdf379a2d9..ae3f00bf22ff91d990ab4c47aaa200729c570181 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 similarity index 100% rename from include/asm-sparc/floppy_64.h rename to arch/sparc/include/asm/floppy_64.h diff --git a/include/asm-sparc/fpumacro.h b/arch/sparc/include/asm/fpumacro.h similarity index 100% rename from include/asm-sparc/fpumacro.h rename to arch/sparc/include/asm/fpumacro.h diff --git a/include/asm-sparc64/ftrace.h b/arch/sparc/include/asm/ftrace.h similarity index 100% rename from include/asm-sparc64/ftrace.h rename to arch/sparc/include/asm/ftrace.h diff --git a/include/asm-sparc/futex.h b/arch/sparc/include/asm/futex.h similarity index 65% rename from include/asm-sparc/futex.h rename to arch/sparc/include/asm/futex.h index c6a9f038c531b22defd2ba117c975a14c660f747..736335f3671370532ce9c8ced8e0adb14e42776a 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/futex_32.h b/arch/sparc/include/asm/futex_32.h similarity index 100% rename from include/asm-sparc/futex_32.h rename to arch/sparc/include/asm/futex_32.h diff --git a/include/asm-sparc/futex_64.h b/arch/sparc/include/asm/futex_64.h similarity index 100% rename from include/asm-sparc/futex_64.h rename to arch/sparc/include/asm/futex_64.h diff --git a/include/asm-sparc/hardirq.h b/arch/sparc/include/asm/hardirq.h similarity index 65% rename from include/asm-sparc/hardirq.h rename to arch/sparc/include/asm/hardirq.h index 15647877310031815fdbcfc2bada8d5de6c856f2..44d4e23451486a9c3d5f0041c42c58bbd3bb145c 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/hardirq_32.h b/arch/sparc/include/asm/hardirq_32.h similarity index 100% rename from include/asm-sparc/hardirq_32.h rename to arch/sparc/include/asm/hardirq_32.h diff --git a/include/asm-sparc/hardirq_64.h b/arch/sparc/include/asm/hardirq_64.h similarity index 100% rename from include/asm-sparc/hardirq_64.h rename to arch/sparc/include/asm/hardirq_64.h diff --git a/include/asm-sparc/head.h b/arch/sparc/include/asm/head.h similarity index 66% rename from include/asm-sparc/head.h rename to arch/sparc/include/asm/head.h index 14652abdea31c42cf97a6a3dc93df7bcb19804ca..be8f03f3e731d568e2260bb09bb1006708a9e2cb 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/head_32.h b/arch/sparc/include/asm/head_32.h similarity index 100% rename from include/asm-sparc/head_32.h rename to arch/sparc/include/asm/head_32.h diff --git a/include/asm-sparc/head_64.h b/arch/sparc/include/asm/head_64.h similarity index 100% rename from include/asm-sparc/head_64.h rename to arch/sparc/include/asm/head_64.h diff --git a/include/asm-sparc/highmem.h b/arch/sparc/include/asm/highmem.h similarity index 100% rename from include/asm-sparc/highmem.h rename to arch/sparc/include/asm/highmem.h diff --git a/include/asm-sparc/hugetlb.h b/arch/sparc/include/asm/hugetlb.h similarity index 100% rename from include/asm-sparc/hugetlb.h rename to arch/sparc/include/asm/hugetlb.h diff --git a/include/asm-sparc/hvtramp.h b/arch/sparc/include/asm/hvtramp.h similarity index 100% rename from include/asm-sparc/hvtramp.h rename to arch/sparc/include/asm/hvtramp.h diff --git a/include/asm-sparc/hw_irq.h b/arch/sparc/include/asm/hw_irq.h similarity index 100% rename from include/asm-sparc/hw_irq.h rename to arch/sparc/include/asm/hw_irq.h diff --git a/include/asm-sparc/hypervisor.h b/arch/sparc/include/asm/hypervisor.h similarity index 100% rename from include/asm-sparc/hypervisor.h rename to arch/sparc/include/asm/hypervisor.h diff --git a/include/asm-sparc/ide.h b/arch/sparc/include/asm/ide.h similarity index 100% rename from include/asm-sparc/ide.h rename to arch/sparc/include/asm/ide.h diff --git a/include/asm-sparc/idprom.h b/arch/sparc/include/asm/idprom.h similarity index 100% rename from include/asm-sparc/idprom.h rename to arch/sparc/include/asm/idprom.h diff --git a/include/asm-sparc/intr_queue.h b/arch/sparc/include/asm/intr_queue.h similarity index 100% rename from include/asm-sparc/intr_queue.h rename to arch/sparc/include/asm/intr_queue.h diff --git a/include/asm-sparc/io-unit.h b/arch/sparc/include/asm/io-unit.h similarity index 100% rename from include/asm-sparc/io-unit.h rename to arch/sparc/include/asm/io-unit.h diff --git a/include/asm-sparc/io.h b/arch/sparc/include/asm/io.h similarity index 67% rename from include/asm-sparc/io.h rename to arch/sparc/include/asm/io.h index fc9024d3dfc30f5fdd7990c581abc33e19acc93b..a34b2994937ab2e4323de0308ab8a630729dcf70 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/io_32.h b/arch/sparc/include/asm/io_32.h similarity index 100% rename from include/asm-sparc/io_32.h rename to arch/sparc/include/asm/io_32.h diff --git a/include/asm-sparc/io_64.h b/arch/sparc/include/asm/io_64.h similarity index 100% rename from include/asm-sparc/io_64.h rename to arch/sparc/include/asm/io_64.h diff --git a/include/asm-sparc/ioctl.h b/arch/sparc/include/asm/ioctl.h similarity index 100% rename from include/asm-sparc/ioctl.h rename to arch/sparc/include/asm/ioctl.h diff --git a/include/asm-sparc/ioctls.h b/arch/sparc/include/asm/ioctls.h similarity index 100% rename from include/asm-sparc/ioctls.h rename to arch/sparc/include/asm/ioctls.h diff --git a/include/asm-sparc/iommu.h b/arch/sparc/include/asm/iommu.h similarity index 65% rename from include/asm-sparc/iommu.h rename to arch/sparc/include/asm/iommu.h index 91b072b0d7a083b1dfa272b7622ecf25d9859974..e650965b4a8d18224c0e68b9abd52d9bdf996fcf 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/iommu_32.h b/arch/sparc/include/asm/iommu_32.h similarity index 100% rename from include/asm-sparc/iommu_32.h rename to arch/sparc/include/asm/iommu_32.h diff --git a/include/asm-sparc/iommu_64.h b/arch/sparc/include/asm/iommu_64.h similarity index 100% rename from include/asm-sparc/iommu_64.h rename to arch/sparc/include/asm/iommu_64.h diff --git a/include/asm-sparc/ipcbuf.h b/arch/sparc/include/asm/ipcbuf.h similarity index 65% rename from include/asm-sparc/ipcbuf.h rename to arch/sparc/include/asm/ipcbuf.h index 037605d986e25f7c527468c67ee33330c2bce9a1..17d6ef7b23a480665487925d0837ccd688833a73 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/ipcbuf_32.h b/arch/sparc/include/asm/ipcbuf_32.h similarity index 100% rename from include/asm-sparc/ipcbuf_32.h rename to arch/sparc/include/asm/ipcbuf_32.h diff --git a/include/asm-sparc/ipcbuf_64.h b/arch/sparc/include/asm/ipcbuf_64.h similarity index 100% rename from include/asm-sparc/ipcbuf_64.h rename to arch/sparc/include/asm/ipcbuf_64.h diff --git a/include/asm-sparc/irq.h b/arch/sparc/include/asm/irq.h similarity index 66% rename from include/asm-sparc/irq.h rename to arch/sparc/include/asm/irq.h index 7af6bb4aa09c8043c68f42fb7ae1a620afc61d57..3b44a6a140747d91837a415496d4b3a065b02abe 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/irq_32.h b/arch/sparc/include/asm/irq_32.h similarity index 100% rename from include/asm-sparc/irq_32.h rename to arch/sparc/include/asm/irq_32.h diff --git a/include/asm-sparc/irq_64.h b/arch/sparc/include/asm/irq_64.h similarity index 100% rename from include/asm-sparc/irq_64.h rename to arch/sparc/include/asm/irq_64.h diff --git a/include/asm-sparc/irq_regs.h b/arch/sparc/include/asm/irq_regs.h similarity index 100% rename from include/asm-sparc/irq_regs.h rename to arch/sparc/include/asm/irq_regs.h diff --git a/include/asm-sparc/irqflags.h b/arch/sparc/include/asm/irqflags.h similarity index 65% rename from include/asm-sparc/irqflags.h rename to arch/sparc/include/asm/irqflags.h index c6402b187e23cca383976e3beacc6bafd8968919..1e138632bd3f03689da1583cb6e70cd377e74698 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/irqflags_32.h b/arch/sparc/include/asm/irqflags_32.h similarity index 96% rename from include/asm-sparc/irqflags_32.h rename to arch/sparc/include/asm/irqflags_32.h index db398fb328263051be401e0e0aabb97fcdf2a77f..0fca9d97d44f15bd1a3832de7e02a990e0fa6577 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 similarity index 97% rename from include/asm-sparc/irqflags_64.h rename to arch/sparc/include/asm/irqflags_64.h index 024fc54d068205befa262d80582d6dc591f34fe6..bb42e59162aab85829566a369255a55ce67180aa 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 similarity index 100% rename from include/asm-sparc/jsflash.h rename to arch/sparc/include/asm/jsflash.h diff --git a/include/asm-sparc/kdebug.h b/arch/sparc/include/asm/kdebug.h similarity index 65% rename from include/asm-sparc/kdebug.h rename to arch/sparc/include/asm/kdebug.h index fe07d00d0534424d0d295341f60ba59cd72e3510..8d12581ca38616458ee1a04a9e7454b6208caa4c 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/kdebug_32.h b/arch/sparc/include/asm/kdebug_32.h similarity index 100% rename from include/asm-sparc/kdebug_32.h rename to arch/sparc/include/asm/kdebug_32.h diff --git a/include/asm-sparc/kdebug_64.h b/arch/sparc/include/asm/kdebug_64.h similarity index 100% rename from include/asm-sparc/kdebug_64.h rename to arch/sparc/include/asm/kdebug_64.h diff --git a/include/asm-sparc/kgdb.h b/arch/sparc/include/asm/kgdb.h similarity index 100% rename from include/asm-sparc/kgdb.h rename to arch/sparc/include/asm/kgdb.h diff --git a/include/asm-sparc/kmap_types.h b/arch/sparc/include/asm/kmap_types.h similarity index 100% rename from include/asm-sparc/kmap_types.h rename to arch/sparc/include/asm/kmap_types.h diff --git a/include/asm-sparc/kprobes.h b/arch/sparc/include/asm/kprobes.h similarity index 100% rename from include/asm-sparc/kprobes.h rename to arch/sparc/include/asm/kprobes.h diff --git a/include/asm-sparc/ldc.h b/arch/sparc/include/asm/ldc.h similarity index 100% rename from include/asm-sparc/ldc.h rename to arch/sparc/include/asm/ldc.h diff --git a/include/asm-sparc/linkage.h b/arch/sparc/include/asm/linkage.h similarity index 100% rename from include/asm-sparc/linkage.h rename to arch/sparc/include/asm/linkage.h diff --git a/include/asm-sparc/lmb.h b/arch/sparc/include/asm/lmb.h similarity index 100% rename from include/asm-sparc/lmb.h rename to arch/sparc/include/asm/lmb.h diff --git a/include/asm-sparc/local.h b/arch/sparc/include/asm/local.h similarity index 100% rename from include/asm-sparc/local.h rename to arch/sparc/include/asm/local.h diff --git a/include/asm-sparc/lsu.h b/arch/sparc/include/asm/lsu.h similarity index 100% rename from include/asm-sparc/lsu.h rename to arch/sparc/include/asm/lsu.h diff --git a/include/asm-sparc/machines.h b/arch/sparc/include/asm/machines.h similarity index 100% rename from include/asm-sparc/machines.h rename to arch/sparc/include/asm/machines.h diff --git a/include/asm-sparc/mbus.h b/arch/sparc/include/asm/mbus.h similarity index 100% rename from include/asm-sparc/mbus.h rename to arch/sparc/include/asm/mbus.h diff --git a/include/asm-sparc/mc146818rtc.h b/arch/sparc/include/asm/mc146818rtc.h similarity index 64% rename from include/asm-sparc/mc146818rtc.h rename to arch/sparc/include/asm/mc146818rtc.h index 9ab65c21e9e43233b2c9c925438bf4c8f1cceba7..67ed9e3a02357260dacd8a065ef8840a9a34de56 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/mc146818rtc_32.h b/arch/sparc/include/asm/mc146818rtc_32.h similarity index 100% rename from include/asm-sparc/mc146818rtc_32.h rename to arch/sparc/include/asm/mc146818rtc_32.h diff --git a/include/asm-sparc/mc146818rtc_64.h b/arch/sparc/include/asm/mc146818rtc_64.h similarity index 100% rename from include/asm-sparc/mc146818rtc_64.h rename to arch/sparc/include/asm/mc146818rtc_64.h diff --git a/include/asm-sparc/mdesc.h b/arch/sparc/include/asm/mdesc.h similarity index 100% rename from include/asm-sparc/mdesc.h rename to arch/sparc/include/asm/mdesc.h diff --git a/include/asm-sparc/memreg.h b/arch/sparc/include/asm/memreg.h similarity index 100% rename from include/asm-sparc/memreg.h rename to arch/sparc/include/asm/memreg.h diff --git a/include/asm-sparc/mman.h b/arch/sparc/include/asm/mman.h similarity index 100% rename from include/asm-sparc/mman.h rename to arch/sparc/include/asm/mman.h diff --git a/include/asm-sparc/mmu.h b/arch/sparc/include/asm/mmu.h similarity index 66% rename from include/asm-sparc/mmu.h rename to arch/sparc/include/asm/mmu.h index ee66bf6dcbd6b1deefbc8a2b90dc5f65d2385827..88fa313887dbafff2db6f62fbb5a8c1eef805a07 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/mmu_32.h b/arch/sparc/include/asm/mmu_32.h similarity index 100% rename from include/asm-sparc/mmu_32.h rename to arch/sparc/include/asm/mmu_32.h diff --git a/include/asm-sparc/mmu_64.h b/arch/sparc/include/asm/mmu_64.h similarity index 100% rename from include/asm-sparc/mmu_64.h rename to arch/sparc/include/asm/mmu_64.h diff --git a/include/asm-sparc/mmu_context.h b/arch/sparc/include/asm/mmu_context.h similarity index 64% rename from include/asm-sparc/mmu_context.h rename to arch/sparc/include/asm/mmu_context.h index e14efb9532ff235c4f5f6e769197a8f557584953..5531346c64f9b55d90d58b07437cc5a1b842ab49 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/mmu_context_32.h b/arch/sparc/include/asm/mmu_context_32.h similarity index 100% rename from include/asm-sparc/mmu_context_32.h rename to 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 similarity index 100% rename from include/asm-sparc/mmu_context_64.h rename to arch/sparc/include/asm/mmu_context_64.h diff --git a/include/asm-sparc/mmzone.h b/arch/sparc/include/asm/mmzone.h similarity index 100% rename from include/asm-sparc/mmzone.h rename to arch/sparc/include/asm/mmzone.h diff --git a/include/asm-sparc/module.h b/arch/sparc/include/asm/module.h similarity index 65% rename from include/asm-sparc/module.h rename to arch/sparc/include/asm/module.h index 516138fe681a53117f673b942ba1b293a203ccee..e82cf9a3e60ee53e22ba05abdb0ef2a024e8b487 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/module_32.h b/arch/sparc/include/asm/module_32.h similarity index 100% rename from include/asm-sparc/module_32.h rename to arch/sparc/include/asm/module_32.h diff --git a/include/asm-sparc/module_64.h b/arch/sparc/include/asm/module_64.h similarity index 100% rename from include/asm-sparc/module_64.h rename to arch/sparc/include/asm/module_64.h diff --git a/include/asm-sparc/mostek.h b/arch/sparc/include/asm/mostek.h similarity index 65% rename from include/asm-sparc/mostek.h rename to arch/sparc/include/asm/mostek.h index 5b9f7fec7ee74cb1b6bb2d72bb952d5268ef8b82..433be3e0a69b375d057ae4a424ab61c806703b59 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/mostek_32.h b/arch/sparc/include/asm/mostek_32.h similarity index 100% rename from include/asm-sparc/mostek_32.h rename to arch/sparc/include/asm/mostek_32.h diff --git a/include/asm-sparc/mostek_64.h b/arch/sparc/include/asm/mostek_64.h similarity index 100% rename from include/asm-sparc/mostek_64.h rename to arch/sparc/include/asm/mostek_64.h diff --git a/include/asm-sparc/mpmbox.h b/arch/sparc/include/asm/mpmbox.h similarity index 100% rename from include/asm-sparc/mpmbox.h rename to arch/sparc/include/asm/mpmbox.h diff --git a/include/asm-sparc/msgbuf.h b/arch/sparc/include/asm/msgbuf.h similarity index 100% rename from include/asm-sparc/msgbuf.h rename to arch/sparc/include/asm/msgbuf.h diff --git a/include/asm-sparc/msi.h b/arch/sparc/include/asm/msi.h similarity index 100% rename from include/asm-sparc/msi.h rename to arch/sparc/include/asm/msi.h diff --git a/include/asm-sparc/mutex.h b/arch/sparc/include/asm/mutex.h similarity index 100% rename from include/asm-sparc/mutex.h rename to arch/sparc/include/asm/mutex.h diff --git a/include/asm-sparc/mxcc.h b/arch/sparc/include/asm/mxcc.h similarity index 100% rename from include/asm-sparc/mxcc.h rename to arch/sparc/include/asm/mxcc.h diff --git a/include/asm-sparc/ns87303.h b/arch/sparc/include/asm/ns87303.h similarity index 100% rename from include/asm-sparc/ns87303.h rename to arch/sparc/include/asm/ns87303.h diff --git a/include/asm-sparc/obio.h b/arch/sparc/include/asm/obio.h similarity index 100% rename from include/asm-sparc/obio.h rename to arch/sparc/include/asm/obio.h diff --git a/include/asm-sparc/of_device.h b/arch/sparc/include/asm/of_device.h similarity index 100% rename from include/asm-sparc/of_device.h rename to arch/sparc/include/asm/of_device.h diff --git a/include/asm-sparc/of_platform.h b/arch/sparc/include/asm/of_platform.h similarity index 64% rename from include/asm-sparc/of_platform.h rename to arch/sparc/include/asm/of_platform.h index 851eb84d737ef61a3eb9ea9fe2c1bcc459373acf..aa699775ffba8c9dd40b56465d725f6aba224fb1 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/of_platform_32.h b/arch/sparc/include/asm/of_platform_32.h similarity index 91% rename from include/asm-sparc/of_platform_32.h rename to arch/sparc/include/asm/of_platform_32.h index 38334351c36b04685861015c7a997676bd224b3a..723f7c9b7411dbce7f5d995b1538a26928cdd630 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. * - * 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 similarity index 91% rename from include/asm-sparc/of_platform_64.h rename to arch/sparc/include/asm/of_platform_64.h index 78aa032b674c42bb7a4e1f02aaa6d243d298d13f..4f66a5f6342d88dae63419b799707fbabba1c3f2 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. * - * 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 similarity index 65% rename from include/asm-sparc/openprom.h rename to arch/sparc/include/asm/openprom.h index 8c349f0619946939cbcef609a403db678620e495..aaeae905ed3f945482a27d812a7df0b245ec22a9 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/openprom_32.h b/arch/sparc/include/asm/openprom_32.h similarity index 100% rename from include/asm-sparc/openprom_32.h rename to arch/sparc/include/asm/openprom_32.h diff --git a/include/asm-sparc/openprom_64.h b/arch/sparc/include/asm/openprom_64.h similarity index 100% rename from include/asm-sparc/openprom_64.h rename to arch/sparc/include/asm/openprom_64.h diff --git a/include/asm-sparc/openpromio.h b/arch/sparc/include/asm/openpromio.h similarity index 100% rename from include/asm-sparc/openpromio.h rename to arch/sparc/include/asm/openpromio.h diff --git a/include/asm-sparc/oplib.h b/arch/sparc/include/asm/oplib.h similarity index 65% rename from include/asm-sparc/oplib.h rename to arch/sparc/include/asm/oplib.h index e88d7c04a292279013e44b15a83843752d4dffa0..72e04e13a6b4059b1c0f5a0946c2510db51f6ce9 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/oplib_32.h b/arch/sparc/include/asm/oplib_32.h similarity index 100% rename from include/asm-sparc/oplib_32.h rename to arch/sparc/include/asm/oplib_32.h diff --git a/include/asm-sparc/oplib_64.h b/arch/sparc/include/asm/oplib_64.h similarity index 100% rename from include/asm-sparc/oplib_64.h rename to arch/sparc/include/asm/oplib_64.h diff --git a/include/asm-sparc/page.h b/arch/sparc/include/asm/page.h similarity index 66% rename from include/asm-sparc/page.h rename to arch/sparc/include/asm/page.h index f32f49fcf75c71f4cf37f4b0123dc833a1a19f7c..f21de034902596744ed071a80b0a53147b04460e 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/page_32.h b/arch/sparc/include/asm/page_32.h similarity index 100% rename from include/asm-sparc/page_32.h rename to arch/sparc/include/asm/page_32.h diff --git a/include/asm-sparc/page_64.h b/arch/sparc/include/asm/page_64.h similarity index 100% rename from include/asm-sparc/page_64.h rename to arch/sparc/include/asm/page_64.h diff --git a/include/asm-sparc/param.h b/arch/sparc/include/asm/param.h similarity index 100% rename from include/asm-sparc/param.h rename to arch/sparc/include/asm/param.h diff --git a/include/asm-sparc/parport.h b/arch/sparc/include/asm/parport.h similarity index 100% rename from include/asm-sparc/parport.h rename to arch/sparc/include/asm/parport.h diff --git a/include/asm-sparc/pbm.h b/arch/sparc/include/asm/pbm.h similarity index 100% rename from include/asm-sparc/pbm.h rename to arch/sparc/include/asm/pbm.h diff --git a/include/asm-sparc/pci.h b/arch/sparc/include/asm/pci.h similarity index 66% rename from include/asm-sparc/pci.h rename to arch/sparc/include/asm/pci.h index b807d52a48091164b0010be6bd4466863508ed8c..6e14fd179335d0a24d05cc71293589b63331607f 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/pci_32.h b/arch/sparc/include/asm/pci_32.h similarity index 100% rename from include/asm-sparc/pci_32.h rename to arch/sparc/include/asm/pci_32.h diff --git a/include/asm-sparc/pci_64.h b/arch/sparc/include/asm/pci_64.h similarity index 100% rename from include/asm-sparc/pci_64.h rename to arch/sparc/include/asm/pci_64.h diff --git a/include/asm-sparc/pcic.h b/arch/sparc/include/asm/pcic.h similarity index 100% rename from include/asm-sparc/pcic.h rename to arch/sparc/include/asm/pcic.h diff --git a/include/asm-sparc/percpu.h b/arch/sparc/include/asm/percpu.h similarity index 65% rename from include/asm-sparc/percpu.h rename to arch/sparc/include/asm/percpu.h index d98ed6cf2e36cdc31541e80bdcb9abd8d9f44a86..bfb1d19ff1bf1ed11303f2a50895d3c692601d90 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/percpu_32.h b/arch/sparc/include/asm/percpu_32.h similarity index 100% rename from include/asm-sparc/percpu_32.h rename to arch/sparc/include/asm/percpu_32.h diff --git a/include/asm-sparc/percpu_64.h b/arch/sparc/include/asm/percpu_64.h similarity index 100% rename from include/asm-sparc/percpu_64.h rename to arch/sparc/include/asm/percpu_64.h diff --git a/include/asm-sparc/perfctr.h b/arch/sparc/include/asm/perfctr.h similarity index 100% rename from include/asm-sparc/perfctr.h rename to arch/sparc/include/asm/perfctr.h diff --git a/include/asm-sparc/pgalloc.h b/arch/sparc/include/asm/pgalloc.h similarity index 65% rename from include/asm-sparc/pgalloc.h rename to arch/sparc/include/asm/pgalloc.h index 7fa02b53d392cef4e9c48a82decdbc639c9b97ae..b6db1f7cdcab325d216c4549a4e3426cf73ca9b5 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h similarity index 100% rename from include/asm-sparc/pgalloc_32.h rename to arch/sparc/include/asm/pgalloc_32.h diff --git a/include/asm-sparc/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h similarity index 100% rename from include/asm-sparc/pgalloc_64.h rename to arch/sparc/include/asm/pgalloc_64.h diff --git a/include/asm-sparc/pgtable.h b/arch/sparc/include/asm/pgtable.h similarity index 65% rename from include/asm-sparc/pgtable.h rename to arch/sparc/include/asm/pgtable.h index 63cdef53bc52ef78ef6521cfe19205be61001d1e..59ba6f6207322ef7533a73998f54d1b1b888fc94 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h similarity index 99% rename from include/asm-sparc/pgtable_32.h rename to arch/sparc/include/asm/pgtable_32.h index 781bd4694a1c1fd2ce698c84c014caecf189bf97..08237fda8874390b267a2036564f364e79eaf1a6 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 similarity index 100% rename from include/asm-sparc/pgtable_64.h rename to arch/sparc/include/asm/pgtable_64.h diff --git a/include/asm-sparc/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h similarity index 100% rename from include/asm-sparc/pgtsrmmu.h rename to arch/sparc/include/asm/pgtsrmmu.h diff --git a/include/asm-sparc/pgtsun4.h b/arch/sparc/include/asm/pgtsun4.h similarity index 100% rename from include/asm-sparc/pgtsun4.h rename to arch/sparc/include/asm/pgtsun4.h diff --git a/include/asm-sparc/pgtsun4c.h b/arch/sparc/include/asm/pgtsun4c.h similarity index 100% rename from include/asm-sparc/pgtsun4c.h rename to arch/sparc/include/asm/pgtsun4c.h diff --git a/include/asm-sparc/pil.h b/arch/sparc/include/asm/pil.h similarity index 100% rename from include/asm-sparc/pil.h rename to arch/sparc/include/asm/pil.h diff --git a/include/asm-sparc/poll.h b/arch/sparc/include/asm/poll.h similarity index 100% rename from include/asm-sparc/poll.h rename to arch/sparc/include/asm/poll.h diff --git a/include/asm-sparc/posix_types.h b/arch/sparc/include/asm/posix_types.h similarity index 64% rename from include/asm-sparc/posix_types.h rename to arch/sparc/include/asm/posix_types.h index 58c820d75e8335db5ab20f7bf375d6f2706fe802..03a0e091a884a1909e5f2e7fb8a03e01a0079370 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/posix_types_32.h b/arch/sparc/include/asm/posix_types_32.h similarity index 100% rename from include/asm-sparc/posix_types_32.h rename to 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 similarity index 100% rename from include/asm-sparc/posix_types_64.h rename to arch/sparc/include/asm/posix_types_64.h diff --git a/include/asm-sparc/processor.h b/arch/sparc/include/asm/processor.h similarity index 64% rename from include/asm-sparc/processor.h rename to arch/sparc/include/asm/processor.h index 11a66bb02eaa01b1dc520e05dfef5adfd2193823..9da9646bf6c6b326ee6d6f47b1d60bd4dd970453 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/processor_32.h b/arch/sparc/include/asm/processor_32.h similarity index 97% rename from include/asm-sparc/processor_32.h rename to arch/sparc/include/asm/processor_32.h index 562c0d69c537adc6914dc100c1e10124a92a3c4c..2ae67a2e7f3a877c21644cbd83adac3e235ae522 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 similarity index 99% rename from include/asm-sparc/processor_64.h rename to arch/sparc/include/asm/processor_64.h index 70d42801a0d20cd08f78eb5dcc544adf49cafc19..137a6bd72fc805f9ddfd4f4a12acd3fdf7199c78 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 similarity index 100% rename from include/asm-sparc/prom.h rename to arch/sparc/include/asm/prom.h diff --git a/include/asm-sparc/psr.h b/arch/sparc/include/asm/psr.h similarity index 100% rename from include/asm-sparc/psr.h rename to arch/sparc/include/asm/psr.h diff --git a/include/asm-sparc/psrcompat.h b/arch/sparc/include/asm/psrcompat.h similarity index 100% rename from include/asm-sparc/psrcompat.h rename to arch/sparc/include/asm/psrcompat.h diff --git a/include/asm-sparc/pstate.h b/arch/sparc/include/asm/pstate.h similarity index 100% rename from include/asm-sparc/pstate.h rename to arch/sparc/include/asm/pstate.h diff --git a/include/asm-sparc/ptrace.h b/arch/sparc/include/asm/ptrace.h similarity index 65% rename from include/asm-sparc/ptrace.h rename to arch/sparc/include/asm/ptrace.h index f36ab6c30ff30cbf19c71e39af7a33c877b4b4bb..6dcbe2eed2e201a4c8bc980dcb15b868474fbcf3 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/ptrace_32.h b/arch/sparc/include/asm/ptrace_32.h similarity index 98% rename from include/asm-sparc/ptrace_32.h rename to arch/sparc/include/asm/ptrace_32.h index 0401cc7ec38e9cd04f839333c5825b97d6795271..d43c88b86834d2fc08986b32e1191b4962bf0f9d 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 similarity index 99% rename from include/asm-sparc/ptrace_64.h rename to arch/sparc/include/asm/ptrace_64.h index a682e66d5c4a635e09cc3941d22f74150d87e948..ec6d45c84cd0e4a0a0aa12cbc6e229b975d6f38e 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 similarity index 100% rename from include/asm-sparc/reboot.h rename to arch/sparc/include/asm/reboot.h diff --git a/include/asm-sparc/reg.h b/arch/sparc/include/asm/reg.h similarity index 66% rename from include/asm-sparc/reg.h rename to arch/sparc/include/asm/reg.h index cb34b0a49aad47375066c73ed031845d64be868d..0c16e19cae4da870e1bee3a512009bb7943ebe9b 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/reg_32.h b/arch/sparc/include/asm/reg_32.h similarity index 98% rename from include/asm-sparc/reg_32.h rename to arch/sparc/include/asm/reg_32.h index 42fecfcd97e7bc92ddc3aee27b01ddcc18e0914a..1efb056fb3d15994c96214ed77ad6348fb097fe4 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 similarity index 97% rename from include/asm-sparc/reg_64.h rename to arch/sparc/include/asm/reg_64.h index eb24a07ff4d568c9d9e53fb30368e6c0e3bc039f..6f277d7c7d88f6114d5d5f2859f78a1323997d00 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 similarity index 100% rename from include/asm-sparc/resource.h rename to arch/sparc/include/asm/resource.h diff --git a/include/asm-sparc/ross.h b/arch/sparc/include/asm/ross.h similarity index 100% rename from include/asm-sparc/ross.h rename to arch/sparc/include/asm/ross.h diff --git a/include/asm-sparc/rtc.h b/arch/sparc/include/asm/rtc.h similarity index 100% rename from include/asm-sparc/rtc.h rename to arch/sparc/include/asm/rtc.h diff --git a/include/asm-sparc/rwsem-const.h b/arch/sparc/include/asm/rwsem-const.h similarity index 100% rename from include/asm-sparc/rwsem-const.h rename to arch/sparc/include/asm/rwsem-const.h diff --git a/include/asm-sparc/rwsem.h b/arch/sparc/include/asm/rwsem.h similarity index 100% rename from include/asm-sparc/rwsem.h rename to arch/sparc/include/asm/rwsem.h diff --git a/include/asm-sparc/sbi.h b/arch/sparc/include/asm/sbi.h similarity index 100% rename from include/asm-sparc/sbi.h rename to arch/sparc/include/asm/sbi.h diff --git a/include/asm-sparc/sbus.h b/arch/sparc/include/asm/sbus.h similarity index 66% rename from include/asm-sparc/sbus.h rename to arch/sparc/include/asm/sbus.h index 8f29a19796658336930648cd958b6b3f4f2833cd..f82481ab44db043cd27314ffa30bf4268ef39e7e 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/sbus_32.h b/arch/sparc/include/asm/sbus_32.h similarity index 100% rename from include/asm-sparc/sbus_32.h rename to arch/sparc/include/asm/sbus_32.h diff --git a/include/asm-sparc/sbus_64.h b/arch/sparc/include/asm/sbus_64.h similarity index 100% rename from include/asm-sparc/sbus_64.h rename to arch/sparc/include/asm/sbus_64.h diff --git a/include/asm-sparc/scatterlist.h b/arch/sparc/include/asm/scatterlist.h similarity index 64% rename from include/asm-sparc/scatterlist.h rename to arch/sparc/include/asm/scatterlist.h index b1a0e316c2b6f762d9f26c3dd530a82caa967fd4..ec21a4517641b16b8414baab15f18a55a4363e27 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/scatterlist_32.h b/arch/sparc/include/asm/scatterlist_32.h similarity index 100% rename from include/asm-sparc/scatterlist_32.h rename to arch/sparc/include/asm/scatterlist_32.h diff --git a/include/asm-sparc/scatterlist_64.h b/arch/sparc/include/asm/scatterlist_64.h similarity index 100% rename from include/asm-sparc/scatterlist_64.h rename to arch/sparc/include/asm/scatterlist_64.h diff --git a/include/asm-sparc/scratchpad.h b/arch/sparc/include/asm/scratchpad.h similarity index 100% rename from include/asm-sparc/scratchpad.h rename to arch/sparc/include/asm/scratchpad.h diff --git a/include/asm-sparc/seccomp.h b/arch/sparc/include/asm/seccomp.h similarity index 100% rename from include/asm-sparc/seccomp.h rename to arch/sparc/include/asm/seccomp.h diff --git a/include/asm-sparc/sections.h b/arch/sparc/include/asm/sections.h similarity index 65% rename from include/asm-sparc/sections.h rename to arch/sparc/include/asm/sections.h index cbd019162425bf90b4df4ef526b7c42370513cc1..c7c69b00967ffe4fa826dcdbece00d901c1fe270 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/sections_32.h b/arch/sparc/include/asm/sections_32.h similarity index 100% rename from include/asm-sparc/sections_32.h rename to arch/sparc/include/asm/sections_32.h diff --git a/include/asm-sparc/sections_64.h b/arch/sparc/include/asm/sections_64.h similarity index 100% rename from include/asm-sparc/sections_64.h rename to arch/sparc/include/asm/sections_64.h diff --git a/include/asm-sparc/sembuf.h b/arch/sparc/include/asm/sembuf.h similarity index 100% rename from include/asm-sparc/sembuf.h rename to arch/sparc/include/asm/sembuf.h diff --git a/include/asm-sparc/setup.h b/arch/sparc/include/asm/setup.h similarity index 100% rename from include/asm-sparc/setup.h rename to arch/sparc/include/asm/setup.h diff --git a/include/asm-sparc/sfafsr.h b/arch/sparc/include/asm/sfafsr.h similarity index 100% rename from include/asm-sparc/sfafsr.h rename to arch/sparc/include/asm/sfafsr.h diff --git a/include/asm-sparc/sfp-machine.h b/arch/sparc/include/asm/sfp-machine.h similarity index 64% rename from include/asm-sparc/sfp-machine.h rename to arch/sparc/include/asm/sfp-machine.h index c676fcc2dd277df52fe27378f00f97f91ad32706..4ebc3823ed4fec0a5fb66ad3324bedab98fe19a2 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/sfp-machine_32.h b/arch/sparc/include/asm/sfp-machine_32.h similarity index 100% rename from include/asm-sparc/sfp-machine_32.h rename to 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 similarity index 100% rename from include/asm-sparc/sfp-machine_64.h rename to arch/sparc/include/asm/sfp-machine_64.h diff --git a/include/asm-sparc/shmbuf.h b/arch/sparc/include/asm/shmbuf.h similarity index 100% rename from include/asm-sparc/shmbuf.h rename to arch/sparc/include/asm/shmbuf.h diff --git a/include/asm-sparc/shmparam.h b/arch/sparc/include/asm/shmparam.h similarity index 65% rename from include/asm-sparc/shmparam.h rename to arch/sparc/include/asm/shmparam.h index 16fda7e9acc851c17ba99616e5c677ecceb73e46..8bf0cfe0694f8951717b8a885c415c254b77949b 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/shmparam_32.h b/arch/sparc/include/asm/shmparam_32.h similarity index 100% rename from include/asm-sparc/shmparam_32.h rename to arch/sparc/include/asm/shmparam_32.h diff --git a/include/asm-sparc/shmparam_64.h b/arch/sparc/include/asm/shmparam_64.h similarity index 100% rename from include/asm-sparc/shmparam_64.h rename to arch/sparc/include/asm/shmparam_64.h diff --git a/include/asm-sparc/sigcontext.h b/arch/sparc/include/asm/sigcontext.h similarity index 64% rename from include/asm-sparc/sigcontext.h rename to arch/sparc/include/asm/sigcontext.h index 82fc7d54a4fa18a55af42944c99ed6fed0d18751..e92de7e286b54dceaf41b679bef2d50a854cdadc 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/sigcontext_32.h b/arch/sparc/include/asm/sigcontext_32.h similarity index 100% rename from include/asm-sparc/sigcontext_32.h rename to arch/sparc/include/asm/sigcontext_32.h diff --git a/include/asm-sparc/sigcontext_64.h b/arch/sparc/include/asm/sigcontext_64.h similarity index 100% rename from include/asm-sparc/sigcontext_64.h rename to arch/sparc/include/asm/sigcontext_64.h diff --git a/include/asm-sparc/siginfo.h b/arch/sparc/include/asm/siginfo.h similarity index 65% rename from include/asm-sparc/siginfo.h rename to arch/sparc/include/asm/siginfo.h index 2c9fccf4ce18f65bccf3becbb1e110cc79057cc3..bd81f8d7f5ce5aff8b846f61daef596a7a342ffa 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/siginfo_32.h b/arch/sparc/include/asm/siginfo_32.h similarity index 100% rename from include/asm-sparc/siginfo_32.h rename to arch/sparc/include/asm/siginfo_32.h diff --git a/include/asm-sparc/siginfo_64.h b/arch/sparc/include/asm/siginfo_64.h similarity index 100% rename from include/asm-sparc/siginfo_64.h rename to arch/sparc/include/asm/siginfo_64.h diff --git a/include/asm-sparc/signal.h b/arch/sparc/include/asm/signal.h similarity index 65% rename from include/asm-sparc/signal.h rename to arch/sparc/include/asm/signal.h index 36f5f9e482f7240ad91f199d4468d114cadd8ac2..27ab05dc203e82bc838d7e9d999e7a2ea827a343 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/signal_32.h b/arch/sparc/include/asm/signal_32.h similarity index 100% rename from include/asm-sparc/signal_32.h rename to arch/sparc/include/asm/signal_32.h diff --git a/include/asm-sparc/signal_64.h b/arch/sparc/include/asm/signal_64.h similarity index 100% rename from include/asm-sparc/signal_64.h rename to arch/sparc/include/asm/signal_64.h diff --git a/include/asm-sparc/smp.h b/arch/sparc/include/asm/smp.h similarity index 66% rename from include/asm-sparc/smp.h rename to arch/sparc/include/asm/smp.h index 1f9dedfbabd816c0cbd8c2abb7d9d1f4e4c10e5c..b59672d0e19b6dd988fda29ad2871040e833168d 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/smp_32.h b/arch/sparc/include/asm/smp_32.h similarity index 100% rename from include/asm-sparc/smp_32.h rename to arch/sparc/include/asm/smp_32.h diff --git a/include/asm-sparc/smp_64.h b/arch/sparc/include/asm/smp_64.h similarity index 100% rename from include/asm-sparc/smp_64.h rename to arch/sparc/include/asm/smp_64.h diff --git a/include/asm-sparc/smpprim.h b/arch/sparc/include/asm/smpprim.h similarity index 100% rename from include/asm-sparc/smpprim.h rename to arch/sparc/include/asm/smpprim.h diff --git a/include/asm-sparc/socket.h b/arch/sparc/include/asm/socket.h similarity index 100% rename from include/asm-sparc/socket.h rename to arch/sparc/include/asm/socket.h diff --git a/include/asm-sparc/sockios.h b/arch/sparc/include/asm/sockios.h similarity index 100% rename from include/asm-sparc/sockios.h rename to arch/sparc/include/asm/sockios.h diff --git a/include/asm-sparc/sparsemem.h b/arch/sparc/include/asm/sparsemem.h similarity index 100% rename from include/asm-sparc/sparsemem.h rename to arch/sparc/include/asm/sparsemem.h diff --git a/include/asm-sparc/spinlock.h b/arch/sparc/include/asm/spinlock.h similarity index 65% rename from include/asm-sparc/spinlock.h rename to arch/sparc/include/asm/spinlock.h index 3b71c50b72eb10c615dc6cd3ba481433bb5352c2..f276b0036b2c4d3d547d25a2a7ff5e9722eac7af 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/spinlock_32.h b/arch/sparc/include/asm/spinlock_32.h similarity index 100% rename from include/asm-sparc/spinlock_32.h rename to arch/sparc/include/asm/spinlock_32.h diff --git a/include/asm-sparc/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h similarity index 100% rename from include/asm-sparc/spinlock_64.h rename to arch/sparc/include/asm/spinlock_64.h diff --git a/include/asm-sparc/spinlock_types.h b/arch/sparc/include/asm/spinlock_types.h similarity index 100% rename from include/asm-sparc/spinlock_types.h rename to arch/sparc/include/asm/spinlock_types.h diff --git a/include/asm-sparc/spitfire.h b/arch/sparc/include/asm/spitfire.h similarity index 100% rename from include/asm-sparc/spitfire.h rename to arch/sparc/include/asm/spitfire.h diff --git a/include/asm-sparc/sstate.h b/arch/sparc/include/asm/sstate.h similarity index 100% rename from include/asm-sparc/sstate.h rename to arch/sparc/include/asm/sstate.h diff --git a/include/asm-sparc/stacktrace.h b/arch/sparc/include/asm/stacktrace.h similarity index 100% rename from include/asm-sparc/stacktrace.h rename to arch/sparc/include/asm/stacktrace.h diff --git a/include/asm-sparc/starfire.h b/arch/sparc/include/asm/starfire.h similarity index 100% rename from include/asm-sparc/starfire.h rename to arch/sparc/include/asm/starfire.h diff --git a/include/asm-sparc/stat.h b/arch/sparc/include/asm/stat.h similarity index 66% rename from include/asm-sparc/stat.h rename to arch/sparc/include/asm/stat.h index 9fdcaf8c9cd30b180b81bbb1dedff0f437601ac3..d8153013df7270d134416ed0ce272db68ab80cb7 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/stat_32.h b/arch/sparc/include/asm/stat_32.h similarity index 100% rename from include/asm-sparc/stat_32.h rename to arch/sparc/include/asm/stat_32.h diff --git a/include/asm-sparc/stat_64.h b/arch/sparc/include/asm/stat_64.h similarity index 100% rename from include/asm-sparc/stat_64.h rename to arch/sparc/include/asm/stat_64.h diff --git a/include/asm-sparc/statfs.h b/arch/sparc/include/asm/statfs.h similarity index 65% rename from include/asm-sparc/statfs.h rename to arch/sparc/include/asm/statfs.h index a70cc52e7018f6fad845c7f6d8f826924e97a7c7..5e937a73743dd85d7b830db6be254be72ed01105 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/statfs_32.h b/arch/sparc/include/asm/statfs_32.h similarity index 100% rename from include/asm-sparc/statfs_32.h rename to arch/sparc/include/asm/statfs_32.h diff --git a/include/asm-sparc/statfs_64.h b/arch/sparc/include/asm/statfs_64.h similarity index 100% rename from include/asm-sparc/statfs_64.h rename to arch/sparc/include/asm/statfs_64.h diff --git a/include/asm-sparc/string.h b/arch/sparc/include/asm/string.h similarity index 65% rename from include/asm-sparc/string.h rename to arch/sparc/include/asm/string.h index 14c04c7697a5e4b61c3bc1703409a1c477d55ca1..98b72a0c8e6e624d0ea6618e4f8ace5736369309 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/string_32.h b/arch/sparc/include/asm/string_32.h similarity index 100% rename from include/asm-sparc/string_32.h rename to arch/sparc/include/asm/string_32.h diff --git a/include/asm-sparc/string_64.h b/arch/sparc/include/asm/string_64.h similarity index 100% rename from include/asm-sparc/string_64.h rename to arch/sparc/include/asm/string_64.h diff --git a/include/asm-sparc/sun4paddr.h b/arch/sparc/include/asm/sun4paddr.h similarity index 100% rename from include/asm-sparc/sun4paddr.h rename to arch/sparc/include/asm/sun4paddr.h diff --git a/include/asm-sparc/sun4prom.h b/arch/sparc/include/asm/sun4prom.h similarity index 100% rename from include/asm-sparc/sun4prom.h rename to arch/sparc/include/asm/sun4prom.h diff --git a/include/asm-sparc/sunbpp.h b/arch/sparc/include/asm/sunbpp.h similarity index 99% rename from include/asm-sparc/sunbpp.h rename to arch/sparc/include/asm/sunbpp.h index 92ee1a8ff3a2783a248c417cb1f19198f163e814..d81a02eaf78bfc392fb0431adf40fe3b82f39fd7 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 similarity index 100% rename from include/asm-sparc/swift.h rename to 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 0000000000000000000000000000000000000000..7486c605e23cb36832ec74019c4adad2a68ec0a9 --- /dev/null +++ b/arch/sparc/include/asm/syscall.h @@ -0,0 +1,120 @@ +#ifndef __ASM_SPARC_SYSCALL_H +#define __ASM_SPARC_SYSCALL_H + +#include +#include +#include + +/* 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 similarity index 100% rename from include/asm-sparc/syscalls.h rename to arch/sparc/include/asm/syscalls.h diff --git a/include/asm-sparc/sysen.h b/arch/sparc/include/asm/sysen.h similarity index 100% rename from include/asm-sparc/sysen.h rename to arch/sparc/include/asm/sysen.h diff --git a/include/asm-sparc/system.h b/arch/sparc/include/asm/system.h similarity index 65% rename from include/asm-sparc/system.h rename to arch/sparc/include/asm/system.h index 15e2a3bc4f6154f95f17a8bb2a1de37214b3a381..7944a7cfc99636032c358bfa894332fb50c07c3a 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/system_32.h b/arch/sparc/include/asm/system_32.h similarity index 100% rename from include/asm-sparc/system_32.h rename to arch/sparc/include/asm/system_32.h diff --git a/include/asm-sparc/system_64.h b/arch/sparc/include/asm/system_64.h similarity index 100% rename from include/asm-sparc/system_64.h rename to arch/sparc/include/asm/system_64.h diff --git a/include/asm-sparc/termbits.h b/arch/sparc/include/asm/termbits.h similarity index 100% rename from include/asm-sparc/termbits.h rename to arch/sparc/include/asm/termbits.h diff --git a/include/asm-sparc/termios.h b/arch/sparc/include/asm/termios.h similarity index 100% rename from include/asm-sparc/termios.h rename to arch/sparc/include/asm/termios.h diff --git a/include/asm-sparc/thread_info.h b/arch/sparc/include/asm/thread_info.h similarity index 64% rename from include/asm-sparc/thread_info.h rename to arch/sparc/include/asm/thread_info.h index 64155cf89f3706130c586bb5a0eebc2eb6ef87d8..122d7acc07e6b91519b756e9676e4dbe10c69ab9 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h similarity index 95% rename from include/asm-sparc/thread_info_32.h rename to arch/sparc/include/asm/thread_info_32.h index 2cf9db0440556005d3b5eef8847184238e79dc97..cbb892d0dff04b033ae371af6175cb443cb2c06e 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< +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/timer_32.h b/arch/sparc/include/asm/timer_32.h similarity index 100% rename from include/asm-sparc/timer_32.h rename to arch/sparc/include/asm/timer_32.h diff --git a/include/asm-sparc/timer_64.h b/arch/sparc/include/asm/timer_64.h similarity index 100% rename from include/asm-sparc/timer_64.h rename to arch/sparc/include/asm/timer_64.h diff --git a/include/asm-sparc/timex.h b/arch/sparc/include/asm/timex.h similarity index 65% rename from include/asm-sparc/timex.h rename to arch/sparc/include/asm/timex.h index 01d9f199d45243c1025fcbf15c48c4c79d47af01..70cc37b73827bc2fe1a3a5045326a893da6c3844 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/timex_32.h b/arch/sparc/include/asm/timex_32.h similarity index 89% rename from include/asm-sparc/timex_32.h rename to arch/sparc/include/asm/timex_32.h index 71b45c90ccae3d5db1959b755d5ad4e7690b386e..b6ccdb0d6f7de3fb23b8691c036be8acaa62e91f 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 similarity index 90% rename from include/asm-sparc/timex_64.h rename to arch/sparc/include/asm/timex_64.h index c622535c45600bd6c9faab97b40255e71685214d..18b30bc9823b4e132d381c5d3de985f7b20c38fc 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 similarity index 66% rename from include/asm-sparc/tlb.h rename to arch/sparc/include/asm/tlb.h index a821057327c4994d34544d87c9aab549b40971c0..92d0393bbcdc5d16b5a0ee9308171e79bc7469a2 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/tlb_32.h b/arch/sparc/include/asm/tlb_32.h similarity index 100% rename from include/asm-sparc/tlb_32.h rename to arch/sparc/include/asm/tlb_32.h diff --git a/include/asm-sparc/tlb_64.h b/arch/sparc/include/asm/tlb_64.h similarity index 100% rename from include/asm-sparc/tlb_64.h rename to arch/sparc/include/asm/tlb_64.h diff --git a/include/asm-sparc/tlbflush.h b/arch/sparc/include/asm/tlbflush.h similarity index 65% rename from include/asm-sparc/tlbflush.h rename to arch/sparc/include/asm/tlbflush.h index 6e6bc12227b86f180108a1df5f26f01b07917aa6..2c9629fad1e2c33c6d33106ac53318e8ca98d94d 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/tlbflush_32.h b/arch/sparc/include/asm/tlbflush_32.h similarity index 100% rename from include/asm-sparc/tlbflush_32.h rename to arch/sparc/include/asm/tlbflush_32.h diff --git a/include/asm-sparc/tlbflush_64.h b/arch/sparc/include/asm/tlbflush_64.h similarity index 100% rename from include/asm-sparc/tlbflush_64.h rename to arch/sparc/include/asm/tlbflush_64.h diff --git a/include/asm-sparc/topology.h b/arch/sparc/include/asm/topology.h similarity index 65% rename from include/asm-sparc/topology.h rename to arch/sparc/include/asm/topology.h index ed13630f32e25f68057f134b4a3083ef6c668f0f..ee4f191d394aa2789e48cdd98d8f51c2d3c8d45e 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/topology_32.h b/arch/sparc/include/asm/topology_32.h similarity index 100% rename from include/asm-sparc/topology_32.h rename to arch/sparc/include/asm/topology_32.h diff --git a/include/asm-sparc/topology_64.h b/arch/sparc/include/asm/topology_64.h similarity index 100% rename from include/asm-sparc/topology_64.h rename to arch/sparc/include/asm/topology_64.h diff --git a/include/asm-sparc/traps.h b/arch/sparc/include/asm/traps.h similarity index 100% rename from include/asm-sparc/traps.h rename to arch/sparc/include/asm/traps.h diff --git a/include/asm-sparc/tsb.h b/arch/sparc/include/asm/tsb.h similarity index 100% rename from include/asm-sparc/tsb.h rename to arch/sparc/include/asm/tsb.h diff --git a/include/asm-sparc/tsunami.h b/arch/sparc/include/asm/tsunami.h similarity index 100% rename from include/asm-sparc/tsunami.h rename to arch/sparc/include/asm/tsunami.h diff --git a/include/asm-sparc/ttable.h b/arch/sparc/include/asm/ttable.h similarity index 100% rename from include/asm-sparc/ttable.h rename to arch/sparc/include/asm/ttable.h diff --git a/include/asm-sparc/turbosparc.h b/arch/sparc/include/asm/turbosparc.h similarity index 100% rename from include/asm-sparc/turbosparc.h rename to arch/sparc/include/asm/turbosparc.h diff --git a/include/asm-sparc/types.h b/arch/sparc/include/asm/types.h similarity index 100% rename from include/asm-sparc/types.h rename to arch/sparc/include/asm/types.h diff --git a/include/asm-sparc/uaccess.h b/arch/sparc/include/asm/uaccess.h similarity index 65% rename from include/asm-sparc/uaccess.h rename to arch/sparc/include/asm/uaccess.h index 424facce5238774118d29473f2a6218d8f7a5adf..e88fbe5c0457a922cd7f761d81378ac91c562703 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h similarity index 100% rename from include/asm-sparc/uaccess_32.h rename to arch/sparc/include/asm/uaccess_32.h diff --git a/include/asm-sparc/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h similarity index 100% rename from include/asm-sparc/uaccess_64.h rename to arch/sparc/include/asm/uaccess_64.h diff --git a/include/asm-sparc/uctx.h b/arch/sparc/include/asm/uctx.h similarity index 100% rename from include/asm-sparc/uctx.h rename to arch/sparc/include/asm/uctx.h diff --git a/include/asm-sparc/unaligned.h b/arch/sparc/include/asm/unaligned.h similarity index 100% rename from include/asm-sparc/unaligned.h rename to arch/sparc/include/asm/unaligned.h diff --git a/include/asm-sparc/unistd.h b/arch/sparc/include/asm/unistd.h similarity index 65% rename from include/asm-sparc/unistd.h rename to arch/sparc/include/asm/unistd.h index 3c2609618a099e037306190ce38ebbd56d848218..4207fb362da03e300ce2cff530ca68401560c7f7 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/unistd_32.h b/arch/sparc/include/asm/unistd_32.h similarity index 100% rename from include/asm-sparc/unistd_32.h rename to arch/sparc/include/asm/unistd_32.h diff --git a/include/asm-sparc/unistd_64.h b/arch/sparc/include/asm/unistd_64.h similarity index 100% rename from include/asm-sparc/unistd_64.h rename to arch/sparc/include/asm/unistd_64.h diff --git a/include/asm-sparc/upa.h b/arch/sparc/include/asm/upa.h similarity index 100% rename from include/asm-sparc/upa.h rename to arch/sparc/include/asm/upa.h diff --git a/include/asm-sparc/user.h b/arch/sparc/include/asm/user.h similarity index 100% rename from include/asm-sparc/user.h rename to arch/sparc/include/asm/user.h diff --git a/include/asm-sparc/utrap.h b/arch/sparc/include/asm/utrap.h similarity index 97% rename from include/asm-sparc/utrap.h rename to arch/sparc/include/asm/utrap.h index 9da37babbe5b895ca7538d0d8880bbc9e6fe9ad5..b10e527c22d967b72d1e172c3d55acef4a7ba34f 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 similarity index 100% rename from include/asm-sparc/vac-ops.h rename to arch/sparc/include/asm/vac-ops.h diff --git a/include/asm-sparc/vaddrs.h b/arch/sparc/include/asm/vaddrs.h similarity index 97% rename from include/asm-sparc/vaddrs.h rename to arch/sparc/include/asm/vaddrs.h index a22fed5a3c6bef64d9b0d6eb75e9699e81754a68..541e13755cecb7159826de08cad615e4c091fbf8 100644 --- a/include/asm-sparc/vaddrs.h +++ b/arch/sparc/include/asm/vaddrs.h @@ -4,7 +4,7 @@ #include /* - * asm-sparc/vaddrs.h: Here we define the virtual addresses at + * asm/vaddrs.h: Here we define the virtual addresses at * which important things will be mapped. * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) diff --git a/include/asm-sparc/vfc_ioctls.h b/arch/sparc/include/asm/vfc_ioctls.h similarity index 100% rename from include/asm-sparc/vfc_ioctls.h rename to arch/sparc/include/asm/vfc_ioctls.h diff --git a/include/asm-sparc/vga.h b/arch/sparc/include/asm/vga.h similarity index 100% rename from include/asm-sparc/vga.h rename to arch/sparc/include/asm/vga.h diff --git a/include/asm-sparc/viking.h b/arch/sparc/include/asm/viking.h similarity index 100% rename from include/asm-sparc/viking.h rename to arch/sparc/include/asm/viking.h diff --git a/include/asm-sparc/vio.h b/arch/sparc/include/asm/vio.h similarity index 100% rename from include/asm-sparc/vio.h rename to arch/sparc/include/asm/vio.h diff --git a/include/asm-sparc/visasm.h b/arch/sparc/include/asm/visasm.h similarity index 100% rename from include/asm-sparc/visasm.h rename to arch/sparc/include/asm/visasm.h diff --git a/include/asm-sparc/watchdog.h b/arch/sparc/include/asm/watchdog.h similarity index 100% rename from include/asm-sparc/watchdog.h rename to arch/sparc/include/asm/watchdog.h diff --git a/include/asm-sparc/winmacro.h b/arch/sparc/include/asm/winmacro.h similarity index 100% rename from include/asm-sparc/winmacro.h rename to arch/sparc/include/asm/winmacro.h diff --git a/include/asm-sparc/xor.h b/arch/sparc/include/asm/xor.h similarity index 66% rename from include/asm-sparc/xor.h rename to arch/sparc/include/asm/xor.h index 35089a838c3f9713a68d6273bcc71f8fb52e0f03..8ed591c7db2dc1ee7220e543759165895bcfa52c 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 +#include #else -#include +#include #endif #endif diff --git a/include/asm-sparc/xor_32.h b/arch/sparc/include/asm/xor_32.h similarity index 99% rename from include/asm-sparc/xor_32.h rename to arch/sparc/include/asm/xor_32.h index f34b2cfa82069f760ae371f16f7e1060578daa12..44bfa0787f3ffeb244b63a044e189f6e88782e8d 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 similarity index 98% rename from include/asm-sparc/xor_64.h rename to arch/sparc/include/asm/xor_64.h index a0233884fc94c6084045b7db829c849ba9a06f24..bee4bf4be3af8cb4a41df1554252381eaddf952b 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 2f96256dc5153bf04e06b176bff63da240495c3f..e8cdf715a546ccb0af9b0802d249368470a5a119 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 81f3b929743f12c17ec44642acb58f6526d4319c..20699c701412dc85506770375e94e3ccbe79efc5 100644 --- a/arch/sparc/kernel/ptrace.c +++ b/arch/sparc/kernel/ptrace.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -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 891f460b7b96ab1e8fb47d3483ba2aadf7361826..4da2e1f6629091ea60e7bccd81fc95b495ae065d 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 3fd1df9f9ba7e849609f5018d443378a301fb2e4..c94f91c8b6e0996dba7f057a815d0005376925d7 100644 --- a/arch/sparc/kernel/signal.c +++ b/arch/sparc/kernel/signal.c @@ -18,6 +18,7 @@ #include #include /* do_coredum */ #include +#include #include #include @@ -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 7c88263256af216c2b6889481297eeb95434949c..923a98959fa7349930efa343a4ab1febd4d5b05f 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 c1979482aa929bbf85db4a97ca7138365b35bda6..c831b0a4e660b69d1221230a2d5460db62459fef 100644 --- a/arch/sparc64/kernel/compat_audit.c +++ b/arch/sparc64/kernel/compat_audit.c @@ -1,4 +1,4 @@ -#include +#include unsigned sparc32_dir_class[] = { #include diff --git a/arch/sparc64/kernel/entry.h b/arch/sparc64/kernel/entry.h index 32fbab620852063dbe525bf3e9e32720af8b2323..fc294a292899ee383906e5040e2509907776527e 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 f6c9fc92921d4405693f6f23ab2817bdee3993fa..bd578cc4856d6de60ed4e3ba54cec2874b32480c 100644 --- a/arch/sparc64/kernel/ptrace.c +++ b/arch/sparc64/kernel/ptrace.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -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 @@ asmlinkage void syscall_trace(struct pt_regs *regs, int syscall_exit_p) 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 c6fc695fe1fe79fb7c695a3d2f51069e031c10b5..97a993c1f7f31bd62e7b310b08077b084622adff 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 9667e96fd5138ba3531f507d8292483e40242a80..d1b84456a9eef969d6be3013432ccf1583631971 100644 --- a/arch/sparc64/kernel/signal.c +++ b/arch/sparc64/kernel/signal.c @@ -17,11 +17,13 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include @@ -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 97cdd1bf4a100201a60a77de7f40ab37e5fb27e8..ba5b09ad6666397a953af76945205961868edb29 100644 --- a/arch/sparc64/kernel/signal32.c +++ b/arch/sparc64/kernel/signal32.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -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 db19ed67acf67fee9df800a5f82a763b47b9635a..a2f24270ed8af9f95b95ee0f685419b621244fa2 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 6cdaf9d33b386631df559a00e93851a44880c13f..0000000000000000000000000000000000000000 --- 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 6cdaf9d33b386631df559a00e93851a44880c13f..0000000000000000000000000000000000000000 --- 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 eb8d4b3f516395d3311014f8f8cf7684fa747d14..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/agp.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/apb.h b/include/asm-sparc64/apb.h deleted file mode 100644 index 5e236ca6e492c097225998c0a44ac1876017b1d2..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/apb.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/asi.h b/include/asm-sparc64/asi.h deleted file mode 100644 index 9b7110c516e8eaf0b8b16b72068fbb16ffd737b1..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/asi.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/atomic.h b/include/asm-sparc64/atomic.h deleted file mode 100644 index f5126826ba342e0b3bd0b1f62070c05317fe4dc5..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/atomic.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/auxio.h b/include/asm-sparc64/auxio.h deleted file mode 100644 index 46c9042f30b4d75c7f42387863a499c0659175a8..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/auxio.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/auxvec.h b/include/asm-sparc64/auxvec.h deleted file mode 100644 index 1f45c67d73165619fe1ee9634751cfa675d1958a..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/auxvec.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/backoff.h b/include/asm-sparc64/backoff.h deleted file mode 100644 index 8ee26d947e0e73a8da975e9eacb746f1d26e8253..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/backoff.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/bbc.h b/include/asm-sparc64/bbc.h deleted file mode 100644 index 06e8b63065148179561f711f245d1af6af84fe1a..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/bbc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/bitops.h b/include/asm-sparc64/bitops.h deleted file mode 100644 index 204404355bddce9d43474123f2653c22fca99693..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/bitops.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/bpp.h b/include/asm-sparc64/bpp.h deleted file mode 100644 index 514eee20272e83b854b13f8330be14950d0f48b7..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/bpp.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/bug.h b/include/asm-sparc64/bug.h deleted file mode 100644 index 3433737c7a67cab5433ee8bbf75a5f9a9e7891e4..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/bug.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/bugs.h b/include/asm-sparc64/bugs.h deleted file mode 100644 index 04ae9e2818cf8a342e39a00e39c614b2f8b9ce3c..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/bugs.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/byteorder.h b/include/asm-sparc64/byteorder.h deleted file mode 100644 index f672855bee1757546497d31d12121ddde0ee2ac8..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/byteorder.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/cache.h b/include/asm-sparc64/cache.h deleted file mode 100644 index fa9de5cadbf1422336604a1fae0895ae4a054b9c..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/cache.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/cacheflush.h b/include/asm-sparc64/cacheflush.h deleted file mode 100644 index cf5b6b3e8a552407a27c6c0aa8272200d02af7c6..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/cacheflush.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/chafsr.h b/include/asm-sparc64/chafsr.h deleted file mode 100644 index aaab97562a39799d0fc9e5e7e0ddbff186b7846e..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/chafsr.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/checksum.h b/include/asm-sparc64/checksum.h deleted file mode 100644 index c3966c5e29d8a11c4fb302572b2e31872f7dd669..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/checksum.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/chmctrl.h b/include/asm-sparc64/chmctrl.h deleted file mode 100644 index eb757b483b309ff4227af290c5a79708ad46977f..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/chmctrl.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/cmt.h b/include/asm-sparc64/cmt.h deleted file mode 100644 index b19b445cb8102bdf6999949c357012e68eb476d8..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/cmt.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/compat.h b/include/asm-sparc64/compat.h deleted file mode 100644 index 8c155d221952e79f7f9141332440bbcf15612920..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/compat.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/compat_signal.h b/include/asm-sparc64/compat_signal.h deleted file mode 100644 index 7187dcc8cac75dc4fb9c8b8bc8e5094fefcafba3..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/compat_signal.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/cpudata.h b/include/asm-sparc64/cpudata.h deleted file mode 100644 index 3220e134a579d2543e202edd9e2040e97a928800..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/cpudata.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/cputime.h b/include/asm-sparc64/cputime.h deleted file mode 100644 index 435f37a92f7cd03a846fa8742d91c732d73df11c..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/cputime.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/current.h b/include/asm-sparc64/current.h deleted file mode 100644 index a7904a7f53a856f757f85683abe7fc7d41cfe554..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/current.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/dcr.h b/include/asm-sparc64/dcr.h deleted file mode 100644 index d67613b1f5fe5400788d8cce9533edb9bfc64e0d..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/dcr.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/dcu.h b/include/asm-sparc64/dcu.h deleted file mode 100644 index 28853f4968d1159dba626b1c9f6846eb7a02f8d4..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/dcu.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/delay.h b/include/asm-sparc64/delay.h deleted file mode 100644 index 33dc5589d841aa17fefee7ea22ef7e27473874ee..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/delay.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/device.h b/include/asm-sparc64/device.h deleted file mode 100644 index 4145c47097e284e01bfa10ea7612b8e950a2de4d..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/device.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/display7seg.h b/include/asm-sparc64/display7seg.h deleted file mode 100644 index e74f046b41def69ba12754d72b6e8be1072ef5d1..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/display7seg.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/div64.h b/include/asm-sparc64/div64.h deleted file mode 100644 index 928c94f99ecf74981a32ade289b8c3e9903fab50..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/div64.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/dma-mapping.h b/include/asm-sparc64/dma-mapping.h deleted file mode 100644 index 380b7b63147ff60c8ca3dab52a0530ab10db076b..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/dma-mapping.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/dma.h b/include/asm-sparc64/dma.h deleted file mode 100644 index 2e36248e6b59dd8f06fbb6fba18ea7a2c0a2d1a9..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/dma.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/ebus.h b/include/asm-sparc64/ebus.h deleted file mode 100644 index d7d476158bd5b18b7dbd116676ea78d872b581ae..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/ebus.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/elf.h b/include/asm-sparc64/elf.h deleted file mode 100644 index f256d9472c8283c3b7193f68f088ee94995b714f..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/elf.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/emergency-restart.h b/include/asm-sparc64/emergency-restart.h deleted file mode 100644 index 2cac7b644da8ac2f6fe148db7b29a2e7c7860e57..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/emergency-restart.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/envctrl.h b/include/asm-sparc64/envctrl.h deleted file mode 100644 index a2cc0ca334bae470bbcf5748aac594d76693b32c..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/envctrl.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/errno.h b/include/asm-sparc64/errno.h deleted file mode 100644 index 9701fe01cc533e9da025c2844bd222eceb0ec2d6..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/errno.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/estate.h b/include/asm-sparc64/estate.h deleted file mode 100644 index bedd0ef5f19cdbbec9b986f6fab41d1e77f47c67..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/estate.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/fb.h b/include/asm-sparc64/fb.h deleted file mode 100644 index 1c2ac5832f3998a060c74155e5e784415d5819f9..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/fb.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/fbio.h b/include/asm-sparc64/fbio.h deleted file mode 100644 index c17edf8c7bc4df69f053eb1f3ea10fa1e6adb428..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/fbio.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/fcntl.h b/include/asm-sparc64/fcntl.h deleted file mode 100644 index 8b1beae48cd1a9ea3f69a7236cb30fda3261cc6d..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/fcntl.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/fhc.h b/include/asm-sparc64/fhc.h deleted file mode 100644 index 73eb04c19c47f8314228a96213f02e73559e6cd7..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/fhc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/floppy.h b/include/asm-sparc64/floppy.h deleted file mode 100644 index 214878114436d5735558511b1a00ae0e753bc32d..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/floppy.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/fpumacro.h b/include/asm-sparc64/fpumacro.h deleted file mode 100644 index 30d6d0f68bc3bc43e109a8842ae4f6685f5c1de0..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/fpumacro.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/futex.h b/include/asm-sparc64/futex.h deleted file mode 100644 index 1ceb0bb2fe53ea6094dafe377bb74e8aae77a9eb..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/futex.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/hardirq.h b/include/asm-sparc64/hardirq.h deleted file mode 100644 index 63dca3db11f33fe91870cbe970b10793fd4c0b8b..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/hardirq.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/head.h b/include/asm-sparc64/head.h deleted file mode 100644 index 2254c09e53f9d0e09f7ee66542d171a571f671f9..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/head.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/hugetlb.h b/include/asm-sparc64/hugetlb.h deleted file mode 100644 index 21d8f0a9c2430324ace1b235e1f19576c9724862..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/hugetlb.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/hvtramp.h b/include/asm-sparc64/hvtramp.h deleted file mode 100644 index fb46bfe934a7705da836a5886d9d04c4bad408cb..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/hvtramp.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/hw_irq.h b/include/asm-sparc64/hw_irq.h deleted file mode 100644 index 16920a291f51af412f59b4343caf71b8a8c106b8..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/hw_irq.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/hypervisor.h b/include/asm-sparc64/hypervisor.h deleted file mode 100644 index fe7e51a9e429ee125c5027607b8c438e636f4327..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/hypervisor.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/ide.h b/include/asm-sparc64/ide.h deleted file mode 100644 index 7125317a428d3495cca83290a826d2340ff29a84..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/ide.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/idprom.h b/include/asm-sparc64/idprom.h deleted file mode 100644 index c22f9c30bc78efac79c69ba49647c95ba598716b..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/idprom.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/intr_queue.h b/include/asm-sparc64/intr_queue.h deleted file mode 100644 index f7225015b3db0f489dd02e07bf540cfc5a88df5b..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/intr_queue.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/io.h b/include/asm-sparc64/io.h deleted file mode 100644 index 25ff258dfd33dd8e48a33c7ddd948ec06118b91c..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/io.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/ioctl.h b/include/asm-sparc64/ioctl.h deleted file mode 100644 index 18fc5623ff51e091e727d92fd08dba27376eb074..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/ioctl.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/ioctls.h b/include/asm-sparc64/ioctls.h deleted file mode 100644 index dcd5540ec10314a36ff9fdc49f972101da6d15e4..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/ioctls.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/iommu.h b/include/asm-sparc64/iommu.h deleted file mode 100644 index 76252bb85e979efb24f3624335f2e290a82e70ad..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/iommu.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/ipcbuf.h b/include/asm-sparc64/ipcbuf.h deleted file mode 100644 index 41dfaf1149b5bd88ca56bdfead1c105be1f69405..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/ipcbuf.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/irq.h b/include/asm-sparc64/irq.h deleted file mode 100644 index b2102e65947cd6fcfe3d6e10799843e2f2a4540e..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/irq.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/irq_regs.h b/include/asm-sparc64/irq_regs.h deleted file mode 100644 index 1e2b8a1e745ae5748dd42eb63a38d73f75368a04..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/irq_regs.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/irqflags.h b/include/asm-sparc64/irqflags.h deleted file mode 100644 index 27b091fc3fa09582b1cb189e796f65152c422ffd..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/irqflags.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/kdebug.h b/include/asm-sparc64/kdebug.h deleted file mode 100644 index 78cfd5d2749b62a37a5d0628bfe5b7c27483d2ec..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/kdebug.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/kgdb.h b/include/asm-sparc64/kgdb.h deleted file mode 100644 index aa6532fd3a13ffffdc40ef923788f3681ded3c5f..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/kgdb.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/kmap_types.h b/include/asm-sparc64/kmap_types.h deleted file mode 100644 index 276530cf5395e5a4d5e46e4c7d7cdd98d135e5e7..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/kmap_types.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/kprobes.h b/include/asm-sparc64/kprobes.h deleted file mode 100644 index c55e43e4d2a4adcfd1fc1140a5e2aab5c75e1ca3..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/kprobes.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/ldc.h b/include/asm-sparc64/ldc.h deleted file mode 100644 index 40f3f231c4575b3c3fcc2f20b45417dcb35a4a9d..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/ldc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/linkage.h b/include/asm-sparc64/linkage.h deleted file mode 100644 index 3ea4fd13f193ce82e837fd0f138112e1cc4c2bb6..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/linkage.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/lmb.h b/include/asm-sparc64/lmb.h deleted file mode 100644 index 3d04981701e2ebfd92b07d23e86ad5dc6a24242f..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/lmb.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/local.h b/include/asm-sparc64/local.h deleted file mode 100644 index c11c530f74d02877738b3b6edb5d59102a9bf01c..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/local.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/lsu.h b/include/asm-sparc64/lsu.h deleted file mode 100644 index 4e3d8b128a5887904d796020a3891d23e33eef22..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/lsu.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/mc146818rtc.h b/include/asm-sparc64/mc146818rtc.h deleted file mode 100644 index 97842e6ed1c2f895294cc86eff7cf384325466cf..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/mc146818rtc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/mdesc.h b/include/asm-sparc64/mdesc.h deleted file mode 100644 index 165a193472862a0f37307e33164b2a4b3ab1d0dd..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/mdesc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/mman.h b/include/asm-sparc64/mman.h deleted file mode 100644 index 17ddb1724f51676be68be0c3738fa6a4ef9ed14b..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/mman.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/mmu.h b/include/asm-sparc64/mmu.h deleted file mode 100644 index e677a64d8db151d370df81049fcded2c6a960dce..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/mmu.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/mmu_context.h b/include/asm-sparc64/mmu_context.h deleted file mode 100644 index 877fee94bd4e626092679c172a811f88a8738c77..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/mmu_context.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/mmzone.h b/include/asm-sparc64/mmzone.h deleted file mode 100644 index 43a710f7892a6ed98fd9e8efcc3ece2f88079d63..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/mmzone.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/module.h b/include/asm-sparc64/module.h deleted file mode 100644 index a9606db55e4a263629fa6da7d3c360c12650f885..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/module.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/mostek.h b/include/asm-sparc64/mostek.h deleted file mode 100644 index 95a752f7e875013cc63cce09b0fa048836882287..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/mostek.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/msgbuf.h b/include/asm-sparc64/msgbuf.h deleted file mode 100644 index 5b33cc9d9bfb1bf75f1180099a922be0c962a0cb..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/msgbuf.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/mutex.h b/include/asm-sparc64/mutex.h deleted file mode 100644 index c0c0f8f260d60eede782c466b2027522395ebbed..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/mutex.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/ns87303.h b/include/asm-sparc64/ns87303.h deleted file mode 100644 index 5f369d4df3dbf27e3d7b257075aed5175cf6ee4d..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/ns87303.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/of_device.h b/include/asm-sparc64/of_device.h deleted file mode 100644 index a769fdbe164a873023ff2a0a31c7293647e1aa71..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/of_device.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/of_platform.h b/include/asm-sparc64/of_platform.h deleted file mode 100644 index f7c427b8bc61a20ed183cbf59c9b8a7aa1da8a69..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/of_platform.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/openprom.h b/include/asm-sparc64/openprom.h deleted file mode 100644 index acf4b234fae381f1934d6e45113bd978ba94a327..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/openprom.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/openpromio.h b/include/asm-sparc64/openpromio.h deleted file mode 100644 index 122fabda21f1ebecad8f621899788639cf3e4a83..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/openpromio.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/oplib.h b/include/asm-sparc64/oplib.h deleted file mode 100644 index d93e44e63510e17ffc3f44f8a472fd03b556895f..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/oplib.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/page.h b/include/asm-sparc64/page.h deleted file mode 100644 index f46c1fb53028f1b4ecc939b3c68c954fcab33de6..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/page.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/param.h b/include/asm-sparc64/param.h deleted file mode 100644 index 40c6dc1108220a8d6fd1a9cfcb3278fcda139c52..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/param.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/parport.h b/include/asm-sparc64/parport.h deleted file mode 100644 index b4e4ca812eb6253f0aeb899afc78ee2886bc4479..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/parport.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/pci.h b/include/asm-sparc64/pci.h deleted file mode 100644 index da54c4d1f39cb5bfa1b6ff364facaa608cb2a5e4..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/pci.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/percpu.h b/include/asm-sparc64/percpu.h deleted file mode 100644 index 292729bb350f890f4549cb821fd20169127af528..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/percpu.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/perfctr.h b/include/asm-sparc64/perfctr.h deleted file mode 100644 index 52073a9f8e306748531b6bdc9bbe6378181b36ee..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/perfctr.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/pgalloc.h b/include/asm-sparc64/pgalloc.h deleted file mode 100644 index bec31641011c1595ac7d0f78f5b9e2e2313b2380..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/pgalloc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/pgtable.h b/include/asm-sparc64/pgtable.h deleted file mode 100644 index 9decbd99aefff9b59f1ff1c007eb83af3dd1783c..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/pgtable.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/pil.h b/include/asm-sparc64/pil.h deleted file mode 100644 index d805f33f1e0fba9d729eb229225bf3b57a548dc9..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/pil.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/poll.h b/include/asm-sparc64/poll.h deleted file mode 100644 index 8e2f31b4641ac6bc6082ea3a5c0787863658395c..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/poll.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/posix_types.h b/include/asm-sparc64/posix_types.h deleted file mode 100644 index 8cee99200232c9d277f857988db654abb277cdf6..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/posix_types.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/processor.h b/include/asm-sparc64/processor.h deleted file mode 100644 index 21de6cc182ebe4b1837e36f78cd06c7756afc004..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/processor.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/prom.h b/include/asm-sparc64/prom.h deleted file mode 100644 index 5fa166ee3ffa3c5103a97c9f6b6afcd964bfcdd7..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/prom.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/psrcompat.h b/include/asm-sparc64/psrcompat.h deleted file mode 100644 index 587846f48358ab987c4d319d049044410fe69352..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/psrcompat.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/pstate.h b/include/asm-sparc64/pstate.h deleted file mode 100644 index 3ccf0be25360208441f50433474ee8d72d75f114..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/pstate.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/ptrace.h b/include/asm-sparc64/ptrace.h deleted file mode 100644 index 1a55b9fb3b0c9b4ca09a78544c0b18fbbdc007f4..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/ptrace.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/reboot.h b/include/asm-sparc64/reboot.h deleted file mode 100644 index 0d72eb811cc8ff4b963380e00785f49acc55c169..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/reboot.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/reg.h b/include/asm-sparc64/reg.h deleted file mode 100644 index 495bab27da0788d4b9f669b7040dd88dd2711adb..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/reg.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/resource.h b/include/asm-sparc64/resource.h deleted file mode 100644 index 46e3bc0de476c2afd5cf4ef18eeba5ae1a162cb7..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/resource.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/rtc.h b/include/asm-sparc64/rtc.h deleted file mode 100644 index e49a9685aead12c8f7186a56e380364dcb37c090..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/rtc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/rwsem-const.h b/include/asm-sparc64/rwsem-const.h deleted file mode 100644 index 2a1de315c86a253443df9d56b1c548aa67c3be5e..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/rwsem-const.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/rwsem.h b/include/asm-sparc64/rwsem.h deleted file mode 100644 index 6943c56ed087f1007912a0a5980972ba0cb8bf33..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/rwsem.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/sbus.h b/include/asm-sparc64/sbus.h deleted file mode 100644 index 0cab0e89b874ed99a2b2d20cb7d5e953be99266a..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/sbus.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/scatterlist.h b/include/asm-sparc64/scatterlist.h deleted file mode 100644 index b7fef95953ca33e9230bbf033696ee6d126977db..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/scatterlist.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/scratchpad.h b/include/asm-sparc64/scratchpad.h deleted file mode 100644 index 23675f6a915aa87c92229be934a2eaa8d9877880..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/scratchpad.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/seccomp.h b/include/asm-sparc64/seccomp.h deleted file mode 100644 index f22f02a08a61a830032b2c2b709942b49277d72d..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/seccomp.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/sections.h b/include/asm-sparc64/sections.h deleted file mode 100644 index 721496f8b2be5f4476259e2b75e1738e6f8aa8e9..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/sections.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/sembuf.h b/include/asm-sparc64/sembuf.h deleted file mode 100644 index c55b952141365a4cfbb4ae524e4b600b13cd67a9..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/sembuf.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/setup.h b/include/asm-sparc64/setup.h deleted file mode 100644 index 7143d06b2c55f0e3473f9a50eff7c17944c3db97..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/setup.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/sfafsr.h b/include/asm-sparc64/sfafsr.h deleted file mode 100644 index 8036fc377a4de13e3af5b9a3f507ca0456f8e4d5..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/sfafsr.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/sfp-machine.h b/include/asm-sparc64/sfp-machine.h deleted file mode 100644 index 7bbc4fecdc7d5d50430f25851b58f6382177b4c4..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/sfp-machine.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/shmbuf.h b/include/asm-sparc64/shmbuf.h deleted file mode 100644 index 0c54a2d68681b432a27d8b195fa8591573d5b432..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/shmbuf.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/shmparam.h b/include/asm-sparc64/shmparam.h deleted file mode 100644 index 5fa3a9b05e7fc7f4c9c56ff5e9682e6f9fefe786..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/shmparam.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/sigcontext.h b/include/asm-sparc64/sigcontext.h deleted file mode 100644 index 5b16dcce44f249b4c64db49915d5e15820028be4..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/sigcontext.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/siginfo.h b/include/asm-sparc64/siginfo.h deleted file mode 100644 index 8ffd6ebabc7aae851a7323abae895cbe9d5a08ba..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/siginfo.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/signal.h b/include/asm-sparc64/signal.h deleted file mode 100644 index 79705e5d49c34c2bd56690f1884d809bffc31866..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/signal.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/smp.h b/include/asm-sparc64/smp.h deleted file mode 100644 index 5095a2cbea5215ce26e084583a7829e773d9f5fd..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/smp.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/socket.h b/include/asm-sparc64/socket.h deleted file mode 100644 index 13e0d5d94bb34bad3973156ca5c09d1ca85f081a..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/socket.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/sockios.h b/include/asm-sparc64/sockios.h deleted file mode 100644 index 2cb4b641482cd9b96c55dc4b3819dfba7b05379d..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/sockios.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/sparsemem.h b/include/asm-sparc64/sparsemem.h deleted file mode 100644 index e681f22a97ae666b59f0fabbcfa7b867e160c0dc..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/sparsemem.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/spinlock.h b/include/asm-sparc64/spinlock.h deleted file mode 100644 index 0115b8156eb8d57b7140f65679901bd254edd055..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/spinlock.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/spinlock_types.h b/include/asm-sparc64/spinlock_types.h deleted file mode 100644 index 48d81c8734b5a9cb98c68ce300050733d1adda4a..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/spinlock_types.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/spitfire.h b/include/asm-sparc64/spitfire.h deleted file mode 100644 index 4430d2fbb0dcccbd15fc003182f49fa019f98730..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/spitfire.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/sstate.h b/include/asm-sparc64/sstate.h deleted file mode 100644 index 97720ce2fd4345af713dda94d22e1befece3c462..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/sstate.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/stacktrace.h b/include/asm-sparc64/stacktrace.h deleted file mode 100644 index adc9b92c0ef1467df49c46bc63b586fdc024e061..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/stacktrace.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/starfire.h b/include/asm-sparc64/starfire.h deleted file mode 100644 index db97daa3bed489722293896eead48566f3aa51e9..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/starfire.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/stat.h b/include/asm-sparc64/stat.h deleted file mode 100644 index b108a866256b80bca60ec9943e460dbefa6e169c..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/stat.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/statfs.h b/include/asm-sparc64/statfs.h deleted file mode 100644 index 5503d6a4c67ee558ccecbe59383d01710d79156b..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/statfs.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/string.h b/include/asm-sparc64/string.h deleted file mode 100644 index 5018cd8b6ad0415a183f23dcc7d33f0a5d428575..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/string.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/sunbpp.h b/include/asm-sparc64/sunbpp.h deleted file mode 100644 index 9632be290eb55b02aa33ac4cad9ed5d7dd0b45a7..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/sunbpp.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/syscalls.h b/include/asm-sparc64/syscalls.h deleted file mode 100644 index 3477b16e30cacf926d6acc6caa7e76676220b4af..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/syscalls.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/system.h b/include/asm-sparc64/system.h deleted file mode 100644 index be2603c2e527d94dc4c3810b038a72671f24184c..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/system.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/termbits.h b/include/asm-sparc64/termbits.h deleted file mode 100644 index e03f97592c708fa35e9bec54588fe82e405558c5..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/termbits.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/termios.h b/include/asm-sparc64/termios.h deleted file mode 100644 index 940495eb05cc04e08967f1e5a965d945d4ea63fa..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/termios.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/thread_info.h b/include/asm-sparc64/thread_info.h deleted file mode 100644 index 92bed791339592e31959720f17cc4d79f06b9ffb..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/thread_info.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/timer.h b/include/asm-sparc64/timer.h deleted file mode 100644 index 88026d83cc937de09c9c91ca1f6c8e2a40b013df..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/timer.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/timex.h b/include/asm-sparc64/timex.h deleted file mode 100644 index 8dd59ee24b48d26827013f31a37eb93d179a580f..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/timex.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/tlb.h b/include/asm-sparc64/tlb.h deleted file mode 100644 index ae92fce1093640dde7d2eb107c5808d07580fd71..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/tlb.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/tlbflush.h b/include/asm-sparc64/tlbflush.h deleted file mode 100644 index a43979a06cd90d396910e12a6a53c5a28cab2452..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/tlbflush.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/topology.h b/include/asm-sparc64/topology.h deleted file mode 100644 index 46999b60fbbabaa8e8fb36eb443200926a82c606..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/topology.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/tsb.h b/include/asm-sparc64/tsb.h deleted file mode 100644 index 3677a302ea3eef64a0dc23d182b7244ec6666f35..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/tsb.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/ttable.h b/include/asm-sparc64/ttable.h deleted file mode 100644 index a550f1bf6f9bb158fbd223f0261f4164ad2fd124..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/ttable.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/types.h b/include/asm-sparc64/types.h deleted file mode 100644 index cfbfad5043eb946405c1400afac3f29851d836d7..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/types.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/uaccess.h b/include/asm-sparc64/uaccess.h deleted file mode 100644 index 2872d22844f36ba94bb5a1cb8badc2a373152aba..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/uaccess.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/uctx.h b/include/asm-sparc64/uctx.h deleted file mode 100644 index 9e1b5794b07fc8ff4c214d1a9c4363c517287fa5..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/uctx.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/unaligned.h b/include/asm-sparc64/unaligned.h deleted file mode 100644 index 19fbf9508acf76492eebf7903ec38896320e0079..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/unaligned.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h deleted file mode 100644 index ad86e0b7a455513b93c5e0c1dceda23753abdeff..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/unistd.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/upa.h b/include/asm-sparc64/upa.h deleted file mode 100644 index aab72930815a09fd399b3755bed2afac164c207a..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/upa.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/user.h b/include/asm-sparc64/user.h deleted file mode 100644 index 29fc6e906c298c5b28eab09fd6dea1a71d114c36..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/user.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/utrap.h b/include/asm-sparc64/utrap.h deleted file mode 100644 index b030a41f1895f9beb6790dfd0abd315086ece5bd..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/utrap.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/vga.h b/include/asm-sparc64/vga.h deleted file mode 100644 index fbf4d58a56f024c889f1adf85051f3e9450da9c2..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/vga.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/vio.h b/include/asm-sparc64/vio.h deleted file mode 100644 index 299b26ab81a7ee7bf00aa03ba0f9501bdbc6f6db..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/vio.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/visasm.h b/include/asm-sparc64/visasm.h deleted file mode 100644 index 837a12278f4ac6e0f37105cad2889ff08480406a..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/visasm.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/watchdog.h b/include/asm-sparc64/watchdog.h deleted file mode 100644 index b0f2857145f7afbbf15c3a3918d5d44069abf981..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/watchdog.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/include/asm-sparc64/xor.h b/include/asm-sparc64/xor.h deleted file mode 100644 index ef187cc07ed5b150b5de506f3b7dff6a6f300f9c..0000000000000000000000000000000000000000 --- a/include/asm-sparc64/xor.h +++ /dev/null @@ -1 +0,0 @@ -#include