sparc, sparc64: use arch/sparc/include

The majority of this patch was created by the following script:

***
ASM=arch/sparc/include/asm
mkdir -p $ASM
git mv include/asm-sparc64/ftrace.h $ASM
git rm include/asm-sparc64/*
git mv include/asm-sparc/* $ASM
sed -ie 's/asm-sparc64/asm/g' $ASM/*
sed -ie 's/asm-sparc/asm/g' $ASM/*
***

The rest was an update of the top-level Makefile to use sparc
for header files when sparc64 is being build.
And a small fixlet to pick up the correct unistd.h from
sparc64 code.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

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
 

include/asm-sparc/atomic.h → arch/sparc/include/asm/atomic.h

 #ifndef ___ASM_SPARC_ATOMIC_H
 #define ___ASM_SPARC_ATOMIC_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/atomic_64.h>
+#include <asm/atomic_64.h>
 #else
-#include <asm-sparc/atomic_32.h>
+#include <asm/atomic_32.h>
 #endif
 #endif

include/asm-sparc/auxio.h → arch/sparc/include/asm/auxio.h

 #ifndef ___ASM_SPARC_AUXIO_H
 #define ___ASM_SPARC_AUXIO_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/auxio_64.h>
+#include <asm/auxio_64.h>
 #else
-#include <asm-sparc/auxio_32.h>
+#include <asm/auxio_32.h>
 #endif
 #endif

include/asm-sparc/auxio_32.h → 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

include/asm-sparc/bitops.h → arch/sparc/include/asm/bitops.h

 #ifndef ___ASM_SPARC_BITOPS_H
 #define ___ASM_SPARC_BITOPS_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/bitops_64.h>
+#include <asm/bitops_64.h>
 #else
-#include <asm-sparc/bitops_32.h>
+#include <asm/bitops_32.h>
 #endif
 #endif

include/asm-sparc/btfixup.h → arch/sparc/include/asm/btfixup.h

 /*
- *  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)
  */

include/asm-sparc/bugs.h → arch/sparc/include/asm/bugs.h

-/* 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)
  */

include/asm-sparc/cacheflush.h → arch/sparc/include/asm/cacheflush.h

 #ifndef ___ASM_SPARC_CACHEFLUSH_H
 #define ___ASM_SPARC_CACHEFLUSH_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/cacheflush_64.h>
+#include <asm/cacheflush_64.h>
 #else
-#include <asm-sparc/cacheflush_32.h>
+#include <asm/cacheflush_32.h>
 #endif
 #endif

include/asm-sparc/checksum.h → arch/sparc/include/asm/checksum.h

 #ifndef ___ASM_SPARC_CHECKSUM_H
 #define ___ASM_SPARC_CHECKSUM_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/checksum_64.h>
+#include <asm/checksum_64.h>
 #else
-#include <asm-sparc/checksum_32.h>
+#include <asm/checksum_32.h>
 #endif
 #endif

include/asm-sparc/cpudata.h → arch/sparc/include/asm/cpudata.h

 #ifndef ___ASM_SPARC_CPUDATA_H
 #define ___ASM_SPARC_CPUDATA_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/cpudata_64.h>
+#include <asm/cpudata_64.h>
 #else
-#include <asm-sparc/cpudata_32.h>
+#include <asm/cpudata_32.h>
 #endif
 #endif

include/asm-sparc/cpudata_32.h → 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.
  */
 

include/asm-sparc/current.h → arch/sparc/include/asm/current.h

-/* 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)

include/asm-sparc/delay.h → arch/sparc/include/asm/delay.h

 #ifndef ___ASM_SPARC_DELAY_H
 #define ___ASM_SPARC_DELAY_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/delay_64.h>
+#include <asm/delay_64.h>
 #else
-#include <asm-sparc/delay_32.h>
+#include <asm/delay_32.h>
 #endif
 #endif

include/asm-sparc/dma-mapping.h → arch/sparc/include/asm/dma-mapping.h

 #ifndef ___ASM_SPARC_DMA_MAPPING_H
 #define ___ASM_SPARC_DMA_MAPPING_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/dma-mapping_64.h>
+#include <asm/dma-mapping_64.h>
 #else
-#include <asm-sparc/dma-mapping_32.h>
+#include <asm/dma-mapping_32.h>
 #endif
 #endif

include/asm-sparc/dma.h → arch/sparc/include/asm/dma.h

 #ifndef ___ASM_SPARC_DMA_H
 #define ___ASM_SPARC_DMA_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/dma_64.h>
+#include <asm/dma_64.h>
 #else
-#include <asm-sparc/dma_32.h>
+#include <asm/dma_32.h>
 #endif
 #endif

include/asm-sparc/dma_32.h → arch/sparc/include/asm/dma_32.h

-/* include/asm-sparc/dma.h
+/* include/asm/dma.h
  *
  * Copyright 1995 (C) David S. Miller (davem@davemloft.net)
  */

include/asm-sparc/dma_64.h → arch/sparc/include/asm/dma_64.h

 /*
- * include/asm-sparc64/dma.h
+ * include/asm/dma.h
  *
  * Copyright 1996 (C) David S. Miller (davem@caip.rutgers.edu)
  */

include/asm-sparc/ebus.h → arch/sparc/include/asm/ebus.h

 #ifndef ___ASM_SPARC_EBUS_H
 #define ___ASM_SPARC_EBUS_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/ebus_64.h>
+#include <asm/ebus_64.h>
 #else
-#include <asm-sparc/ebus_32.h>
+#include <asm/ebus_32.h>
 #endif
 #endif

include/asm-sparc/elf.h → arch/sparc/include/asm/elf.h

 #ifndef ___ASM_SPARC_ELF_H
 #define ___ASM_SPARC_ELF_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/elf_64.h>
+#include <asm/elf_64.h>
 #else
-#include <asm-sparc/elf_32.h>
+#include <asm/elf_32.h>
 #endif
 #endif

include/asm-sparc/floppy.h → arch/sparc/include/asm/floppy.h

 #ifndef ___ASM_SPARC_FLOPPY_H
 #define ___ASM_SPARC_FLOPPY_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/floppy_64.h>
+#include <asm/floppy_64.h>
 #else
-#include <asm-sparc/floppy_32.h>
+#include <asm/floppy_32.h>
 #endif
 #endif

include/asm-sparc/floppy_32.h → arch/sparc/include/asm/floppy_32.h

-/* 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)
  */

include/asm-sparc/futex.h → arch/sparc/include/asm/futex.h

 #ifndef ___ASM_SPARC_FUTEX_H
 #define ___ASM_SPARC_FUTEX_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/futex_64.h>
+#include <asm/futex_64.h>
 #else
-#include <asm-sparc/futex_32.h>
+#include <asm/futex_32.h>
 #endif
 #endif

include/asm-sparc/hardirq.h → arch/sparc/include/asm/hardirq.h

 #ifndef ___ASM_SPARC_HARDIRQ_H
 #define ___ASM_SPARC_HARDIRQ_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/hardirq_64.h>
+#include <asm/hardirq_64.h>
 #else
-#include <asm-sparc/hardirq_32.h>
+#include <asm/hardirq_32.h>
 #endif
 #endif

include/asm-sparc/head.h → arch/sparc/include/asm/head.h

 #ifndef ___ASM_SPARC_HEAD_H
 #define ___ASM_SPARC_HEAD_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/head_64.h>
+#include <asm/head_64.h>
 #else
-#include <asm-sparc/head_32.h>
+#include <asm/head_32.h>
 #endif
 #endif

include/asm-sparc/io.h → arch/sparc/include/asm/io.h

 #ifndef ___ASM_SPARC_IO_H
 #define ___ASM_SPARC_IO_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/io_64.h>
+#include <asm/io_64.h>
 #else
-#include <asm-sparc/io_32.h>
+#include <asm/io_32.h>
 #endif
 #endif

include/asm-sparc/iommu.h → arch/sparc/include/asm/iommu.h

 #ifndef ___ASM_SPARC_IOMMU_H
 #define ___ASM_SPARC_IOMMU_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/iommu_64.h>
+#include <asm/iommu_64.h>
 #else
-#include <asm-sparc/iommu_32.h>
+#include <asm/iommu_32.h>
 #endif
 #endif

include/asm-sparc/ipcbuf.h → arch/sparc/include/asm/ipcbuf.h

 #ifndef ___ASM_SPARC_IPCBUF_H
 #define ___ASM_SPARC_IPCBUF_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/ipcbuf_64.h>
+#include <asm/ipcbuf_64.h>
 #else
-#include <asm-sparc/ipcbuf_32.h>
+#include <asm/ipcbuf_32.h>
 #endif
 #endif

include/asm-sparc/irq.h → arch/sparc/include/asm/irq.h

 #ifndef ___ASM_SPARC_IRQ_H
 #define ___ASM_SPARC_IRQ_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/irq_64.h>
+#include <asm/irq_64.h>
 #else
-#include <asm-sparc/irq_32.h>
+#include <asm/irq_32.h>
 #endif
 #endif

include/asm-sparc/irqflags.h → arch/sparc/include/asm/irqflags.h

 #ifndef ___ASM_SPARC_IRQFLAGS_H
 #define ___ASM_SPARC_IRQFLAGS_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/irqflags_64.h>
+#include <asm/irqflags_64.h>
 #else
-#include <asm-sparc/irqflags_32.h>
+#include <asm/irqflags_32.h>
 #endif
 #endif

include/asm-sparc/irqflags_32.h → arch/sparc/include/asm/irqflags_32.h

 /*
- * include/asm-sparc/irqflags.h
+ * include/asm/irqflags.h
  *
  * IRQ flags handling
  *

include/asm-sparc/irqflags_64.h → arch/sparc/include/asm/irqflags_64.h

 /*
- * include/asm-sparc64/irqflags.h
+ * include/asm/irqflags.h
  *
  * IRQ flags handling
  *

include/asm-sparc/kdebug.h → arch/sparc/include/asm/kdebug.h

 #ifndef ___ASM_SPARC_KDEBUG_H
 #define ___ASM_SPARC_KDEBUG_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/kdebug_64.h>
+#include <asm/kdebug_64.h>
 #else
-#include <asm-sparc/kdebug_32.h>
+#include <asm/kdebug_32.h>
 #endif
 #endif

include/asm-sparc/mc146818rtc.h → arch/sparc/include/asm/mc146818rtc.h

 #ifndef ___ASM_SPARC_MC146818RTC_H
 #define ___ASM_SPARC_MC146818RTC_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/mc146818rtc_64.h>
+#include <asm/mc146818rtc_64.h>
 #else
-#include <asm-sparc/mc146818rtc_32.h>
+#include <asm/mc146818rtc_32.h>
 #endif
 #endif

include/asm-sparc/mmu.h → arch/sparc/include/asm/mmu.h

 #ifndef ___ASM_SPARC_MMU_H
 #define ___ASM_SPARC_MMU_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/mmu_64.h>
+#include <asm/mmu_64.h>
 #else
-#include <asm-sparc/mmu_32.h>
+#include <asm/mmu_32.h>
 #endif
 #endif

include/asm-sparc/mmu_context.h → arch/sparc/include/asm/mmu_context.h

 #ifndef ___ASM_SPARC_MMU_CONTEXT_H
 #define ___ASM_SPARC_MMU_CONTEXT_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/mmu_context_64.h>
+#include <asm/mmu_context_64.h>
 #else
-#include <asm-sparc/mmu_context_32.h>
+#include <asm/mmu_context_32.h>
 #endif
 #endif

include/asm-sparc/module.h → arch/sparc/include/asm/module.h

 #ifndef ___ASM_SPARC_MODULE_H
 #define ___ASM_SPARC_MODULE_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/module_64.h>
+#include <asm/module_64.h>
 #else
-#include <asm-sparc/module_32.h>
+#include <asm/module_32.h>
 #endif
 #endif

include/asm-sparc/mostek.h → arch/sparc/include/asm/mostek.h

 #ifndef ___ASM_SPARC_MOSTEK_H
 #define ___ASM_SPARC_MOSTEK_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/mostek_64.h>
+#include <asm/mostek_64.h>
 #else
-#include <asm-sparc/mostek_32.h>
+#include <asm/mostek_32.h>
 #endif
 #endif

include/asm-sparc/of_platform.h → arch/sparc/include/asm/of_platform.h

 #ifndef ___ASM_SPARC_OF_PLATFORM_H
 #define ___ASM_SPARC_OF_PLATFORM_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/of_platform_64.h>
+#include <asm/of_platform_64.h>
 #else
-#include <asm-sparc/of_platform_32.h>
+#include <asm/of_platform_32.h>
 #endif
 #endif

include/asm-sparc/of_platform_32.h → arch/sparc/include/asm/of_platform_32.h

@@ -3,7 +3,7 @@
 /*
  *    Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.
  *			 <benh@kernel.crashing.org>
- *    Modified for Sparc by merging parts of asm-sparc/of_device.h
+ *    Modified for Sparc by merging parts of asm/of_device.h
  *		by Stephen Rothwell
  *
  *  This program is free software; you can redistribute it and/or

include/asm-sparc/of_platform_64.h → arch/sparc/include/asm/of_platform_64.h

@@ -3,7 +3,7 @@
 /*
  *    Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.
  *			 <benh@kernel.crashing.org>
- *    Modified for Sparc by merging parts of asm-sparc/of_device.h
+ *    Modified for Sparc by merging parts of asm/of_device.h
  *		by Stephen Rothwell
  *
  *  This program is free software; you can redistribute it and/or

include/asm-sparc/openprom.h → arch/sparc/include/asm/openprom.h

 #ifndef ___ASM_SPARC_OPENPROM_H
 #define ___ASM_SPARC_OPENPROM_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/openprom_64.h>
+#include <asm/openprom_64.h>
 #else
-#include <asm-sparc/openprom_32.h>
+#include <asm/openprom_32.h>
 #endif
 #endif

include/asm-sparc/oplib.h → arch/sparc/include/asm/oplib.h

 #ifndef ___ASM_SPARC_OPLIB_H
 #define ___ASM_SPARC_OPLIB_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/oplib_64.h>
+#include <asm/oplib_64.h>
 #else
-#include <asm-sparc/oplib_32.h>
+#include <asm/oplib_32.h>
 #endif
 #endif

include/asm-sparc/page.h → arch/sparc/include/asm/page.h

 #ifndef ___ASM_SPARC_PAGE_H
 #define ___ASM_SPARC_PAGE_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/page_64.h>
+#include <asm/page_64.h>
 #else
-#include <asm-sparc/page_32.h>
+#include <asm/page_32.h>
 #endif
 #endif

include/asm-sparc/pci.h → arch/sparc/include/asm/pci.h

 #ifndef ___ASM_SPARC_PCI_H
 #define ___ASM_SPARC_PCI_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/pci_64.h>
+#include <asm/pci_64.h>
 #else
-#include <asm-sparc/pci_32.h>
+#include <asm/pci_32.h>
 #endif
 #endif

include/asm-sparc/percpu.h → arch/sparc/include/asm/percpu.h

 #ifndef ___ASM_SPARC_PERCPU_H
 #define ___ASM_SPARC_PERCPU_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/percpu_64.h>
+#include <asm/percpu_64.h>
 #else
-#include <asm-sparc/percpu_32.h>
+#include <asm/percpu_32.h>
 #endif
 #endif

include/asm-sparc/pgalloc.h → arch/sparc/include/asm/pgalloc.h

 #ifndef ___ASM_SPARC_PGALLOC_H
 #define ___ASM_SPARC_PGALLOC_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/pgalloc_64.h>
+#include <asm/pgalloc_64.h>
 #else
-#include <asm-sparc/pgalloc_32.h>
+#include <asm/pgalloc_32.h>
 #endif
 #endif

include/asm-sparc/pgtable.h → arch/sparc/include/asm/pgtable.h

 #ifndef ___ASM_SPARC_PGTABLE_H
 #define ___ASM_SPARC_PGTABLE_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/pgtable_64.h>
+#include <asm/pgtable_64.h>
 #else
-#include <asm-sparc/pgtable_32.h>
+#include <asm/pgtable_32.h>
 #endif
 #endif

include/asm-sparc/pgtable_32.h → arch/sparc/include/asm/pgtable_32.h

 #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)

include/asm-sparc/posix_types.h → arch/sparc/include/asm/posix_types.h

 #ifndef ___ASM_SPARC_POSIX_TYPES_H
 #define ___ASM_SPARC_POSIX_TYPES_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/posix_types_64.h>
+#include <asm/posix_types_64.h>
 #else
-#include <asm-sparc/posix_types_32.h>
+#include <asm/posix_types_32.h>
 #endif
 #endif

include/asm-sparc/processor.h → arch/sparc/include/asm/processor.h

 #ifndef ___ASM_SPARC_PROCESSOR_H
 #define ___ASM_SPARC_PROCESSOR_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/processor_64.h>
+#include <asm/processor_64.h>
 #else
-#include <asm-sparc/processor_32.h>
+#include <asm/processor_32.h>
 #endif
 #endif

include/asm-sparc/processor_32.h → arch/sparc/include/asm/processor_32.h

-/* include/asm-sparc/processor.h
+/* include/asm/processor.h
  *
  * Copyright (C) 1994 David S. Miller (davem@caip.rutgers.edu)
  */

include/asm-sparc/processor_64.h → arch/sparc/include/asm/processor_64.h

 /*
- * include/asm-sparc64/processor.h
+ * include/asm/processor.h
  *
  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
  */

include/asm-sparc/ptrace.h → arch/sparc/include/asm/ptrace.h

 #ifndef ___ASM_SPARC_PTRACE_H
 #define ___ASM_SPARC_PTRACE_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/ptrace_64.h>
+#include <asm/ptrace_64.h>
 #else
-#include <asm-sparc/ptrace_32.h>
+#include <asm/ptrace_32.h>
 #endif
 #endif

include/asm-sparc/reg.h → arch/sparc/include/asm/reg.h

 #ifndef ___ASM_SPARC_REG_H
 #define ___ASM_SPARC_REG_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/reg_64.h>
+#include <asm/reg_64.h>
 #else
-#include <asm-sparc/reg_32.h>
+#include <asm/reg_32.h>
 #endif
 #endif

include/asm-sparc/reg_32.h → arch/sparc/include/asm/reg_32.h

 /*
- * 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

include/asm-sparc/reg_64.h → arch/sparc/include/asm/reg_64.h

 /*
- * 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

include/asm-sparc/sbus.h → arch/sparc/include/asm/sbus.h

 #ifndef ___ASM_SPARC_SBUS_H
 #define ___ASM_SPARC_SBUS_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/sbus_64.h>
+#include <asm/sbus_64.h>
 #else
-#include <asm-sparc/sbus_32.h>
+#include <asm/sbus_32.h>
 #endif
 #endif

include/asm-sparc/scatterlist.h → arch/sparc/include/asm/scatterlist.h

 #ifndef ___ASM_SPARC_SCATTERLIST_H
 #define ___ASM_SPARC_SCATTERLIST_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/scatterlist_64.h>
+#include <asm/scatterlist_64.h>
 #else
-#include <asm-sparc/scatterlist_32.h>
+#include <asm/scatterlist_32.h>
 #endif
 #endif

include/asm-sparc/sections.h → arch/sparc/include/asm/sections.h

 #ifndef ___ASM_SPARC_SECTIONS_H
 #define ___ASM_SPARC_SECTIONS_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/sections_64.h>
+#include <asm/sections_64.h>
 #else
-#include <asm-sparc/sections_32.h>
+#include <asm/sections_32.h>
 #endif
 #endif

include/asm-sparc/sfp-machine.h → arch/sparc/include/asm/sfp-machine.h

 #ifndef ___ASM_SPARC_SFP_MACHINE_H
 #define ___ASM_SPARC_SFP_MACHINE_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/sfp-machine_64.h>
+#include <asm/sfp-machine_64.h>
 #else
-#include <asm-sparc/sfp-machine_32.h>
+#include <asm/sfp-machine_32.h>
 #endif
 #endif

include/asm-sparc/shmparam.h → arch/sparc/include/asm/shmparam.h

 #ifndef ___ASM_SPARC_SHMPARAM_H
 #define ___ASM_SPARC_SHMPARAM_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/shmparam_64.h>
+#include <asm/shmparam_64.h>
 #else
-#include <asm-sparc/shmparam_32.h>
+#include <asm/shmparam_32.h>
 #endif
 #endif

include/asm-sparc/sigcontext.h → arch/sparc/include/asm/sigcontext.h

 #ifndef ___ASM_SPARC_SIGCONTEXT_H
 #define ___ASM_SPARC_SIGCONTEXT_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/sigcontext_64.h>
+#include <asm/sigcontext_64.h>
 #else
-#include <asm-sparc/sigcontext_32.h>
+#include <asm/sigcontext_32.h>
 #endif
 #endif

include/asm-sparc/siginfo.h → arch/sparc/include/asm/siginfo.h

 #ifndef ___ASM_SPARC_SIGINFO_H
 #define ___ASM_SPARC_SIGINFO_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/siginfo_64.h>
+#include <asm/siginfo_64.h>
 #else
-#include <asm-sparc/siginfo_32.h>
+#include <asm/siginfo_32.h>
 #endif
 #endif

include/asm-sparc/signal.h → arch/sparc/include/asm/signal.h

 #ifndef ___ASM_SPARC_SIGNAL_H
 #define ___ASM_SPARC_SIGNAL_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/signal_64.h>
+#include <asm/signal_64.h>
 #else
-#include <asm-sparc/signal_32.h>
+#include <asm/signal_32.h>
 #endif
 #endif

include/asm-sparc/smp.h → arch/sparc/include/asm/smp.h

 #ifndef ___ASM_SPARC_SMP_H
 #define ___ASM_SPARC_SMP_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/smp_64.h>
+#include <asm/smp_64.h>
 #else
-#include <asm-sparc/smp_32.h>
+#include <asm/smp_32.h>
 #endif
 #endif

include/asm-sparc/spinlock.h → arch/sparc/include/asm/spinlock.h

 #ifndef ___ASM_SPARC_SPINLOCK_H
 #define ___ASM_SPARC_SPINLOCK_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/spinlock_64.h>
+#include <asm/spinlock_64.h>
 #else
-#include <asm-sparc/spinlock_32.h>
+#include <asm/spinlock_32.h>
 #endif
 #endif

include/asm-sparc/stat.h → arch/sparc/include/asm/stat.h

 #ifndef ___ASM_SPARC_STAT_H
 #define ___ASM_SPARC_STAT_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/stat_64.h>
+#include <asm/stat_64.h>
 #else
-#include <asm-sparc/stat_32.h>
+#include <asm/stat_32.h>
 #endif
 #endif

include/asm-sparc/statfs.h → arch/sparc/include/asm/statfs.h

 #ifndef ___ASM_SPARC_STATFS_H
 #define ___ASM_SPARC_STATFS_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/statfs_64.h>
+#include <asm/statfs_64.h>
 #else
-#include <asm-sparc/statfs_32.h>
+#include <asm/statfs_32.h>
 #endif
 #endif

include/asm-sparc/string.h → arch/sparc/include/asm/string.h

 #ifndef ___ASM_SPARC_STRING_H
 #define ___ASM_SPARC_STRING_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/string_64.h>
+#include <asm/string_64.h>
 #else
-#include <asm-sparc/string_32.h>
+#include <asm/string_32.h>
 #endif
 #endif

include/asm-sparc/sunbpp.h → arch/sparc/include/asm/sunbpp.h

 /*
- * include/asm-sparc/sunbpp.h
+ * include/asm/sunbpp.h
  */
 
 #ifndef _ASM_SPARC_SUNBPP_H

include/asm-sparc/system.h → arch/sparc/include/asm/system.h

 #ifndef ___ASM_SPARC_SYSTEM_H
 #define ___ASM_SPARC_SYSTEM_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/system_64.h>
+#include <asm/system_64.h>
 #else
-#include <asm-sparc/system_32.h>
+#include <asm/system_32.h>
 #endif
 #endif

include/asm-sparc/thread_info.h → arch/sparc/include/asm/thread_info.h

 #ifndef ___ASM_SPARC_THREAD_INFO_H
 #define ___ASM_SPARC_THREAD_INFO_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/thread_info_64.h>
+#include <asm/thread_info_64.h>
 #else
-#include <asm-sparc/thread_info_32.h>
+#include <asm/thread_info_32.h>
 #endif
 #endif

include/asm-sparc/timer.h → arch/sparc/include/asm/timer.h

 #ifndef ___ASM_SPARC_TIMER_H
 #define ___ASM_SPARC_TIMER_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/timer_64.h>
+#include <asm/timer_64.h>
 #else
-#include <asm-sparc/timer_32.h>
+#include <asm/timer_32.h>
 #endif
 #endif

include/asm-sparc/timex.h → arch/sparc/include/asm/timex.h

 #ifndef ___ASM_SPARC_TIMEX_H
 #define ___ASM_SPARC_TIMEX_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/timex_64.h>
+#include <asm/timex_64.h>
 #else
-#include <asm-sparc/timex_32.h>
+#include <asm/timex_32.h>
 #endif
 #endif

include/asm-sparc/timex_32.h → arch/sparc/include/asm/timex_32.h

 /*
- * linux/include/asm-sparc/timex.h
+ * linux/include/asm/timex.h
  *
  * sparc architecture timex specifications
  */

include/asm-sparc/timex_64.h → arch/sparc/include/asm/timex_64.h

 /*
- * linux/include/asm-sparc64/timex.h
+ * linux/include/asm/timex.h
  *
  * sparc64 architecture timex specifications
  */

include/asm-sparc/tlb.h → arch/sparc/include/asm/tlb.h

 #ifndef ___ASM_SPARC_TLB_H
 #define ___ASM_SPARC_TLB_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/tlb_64.h>
+#include <asm/tlb_64.h>
 #else
-#include <asm-sparc/tlb_32.h>
+#include <asm/tlb_32.h>
 #endif
 #endif

include/asm-sparc/tlbflush.h → arch/sparc/include/asm/tlbflush.h

 #ifndef ___ASM_SPARC_TLBFLUSH_H
 #define ___ASM_SPARC_TLBFLUSH_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/tlbflush_64.h>
+#include <asm/tlbflush_64.h>
 #else
-#include <asm-sparc/tlbflush_32.h>
+#include <asm/tlbflush_32.h>
 #endif
 #endif

include/asm-sparc/topology.h → arch/sparc/include/asm/topology.h

 #ifndef ___ASM_SPARC_TOPOLOGY_H
 #define ___ASM_SPARC_TOPOLOGY_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/topology_64.h>
+#include <asm/topology_64.h>
 #else
-#include <asm-sparc/topology_32.h>
+#include <asm/topology_32.h>
 #endif
 #endif

include/asm-sparc/uaccess.h → arch/sparc/include/asm/uaccess.h

 #ifndef ___ASM_SPARC_UACCESS_H
 #define ___ASM_SPARC_UACCESS_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/uaccess_64.h>
+#include <asm/uaccess_64.h>
 #else
-#include <asm-sparc/uaccess_32.h>
+#include <asm/uaccess_32.h>
 #endif
 #endif

include/asm-sparc/unistd.h → arch/sparc/include/asm/unistd.h

 #ifndef ___ASM_SPARC_UNISTD_H
 #define ___ASM_SPARC_UNISTD_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/unistd_64.h>
+#include <asm/unistd_64.h>
 #else
-#include <asm-sparc/unistd_32.h>
+#include <asm/unistd_32.h>
 #endif
 #endif

include/asm-sparc/utrap.h → arch/sparc/include/asm/utrap.h

 /*
- * include/asm-sparc64/utrap.h
+ * include/asm/utrap.h
  *
  * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
  */

include/asm-sparc/vaddrs.h → arch/sparc/include/asm/vaddrs.h

@@ -4,7 +4,7 @@
 #include <asm/head.h>
 
 /*
- * asm-sparc/vaddrs.h:  Here we define the virtual addresses at
+ * asm/vaddrs.h:  Here we define the virtual addresses at
  *                      which important things will be mapped.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)

include/asm-sparc/xor.h → arch/sparc/include/asm/xor.h

 #ifndef ___ASM_SPARC_XOR_H
 #define ___ASM_SPARC_XOR_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/xor_64.h>
+#include <asm/xor_64.h>
 #else
-#include <asm-sparc/xor_32.h>
+#include <asm/xor_32.h>
 #endif
 #endif

include/asm-sparc/xor_32.h → arch/sparc/include/asm/xor_32.h

 /*
- * include/asm-sparc/xor.h
+ * include/asm/xor.h
  *
  * Optimized RAID-5 checksumming functions for 32-bit Sparc.
  *

include/asm-sparc/xor_64.h → arch/sparc/include/asm/xor_64.h

 /*
- * 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

arch/sparc64/kernel/compat_audit.c

-#include <asm-sparc/unistd.h>
+#include <asm/unistd_32.h>
 
 unsigned sparc32_dir_class[] = {
 #include <asm-generic/audit_dir_write.h>

include/asm-sparc64/Kbuild

-# dummy file to avoid breaking make headers_install

include/asm-sparc64/agp.h

-#include <asm-sparc/agp.h>

include/asm-sparc64/apb.h

-#include <asm-sparc/apb.h>

include/asm-sparc64/asi.h

-#include <asm-sparc/asi.h>

include/asm-sparc64/atomic.h

-#include <asm-sparc/atomic.h>

include/asm-sparc64/auxio.h

-#include <asm-sparc/auxio.h>

include/asm-sparc64/auxvec.h

-#include <asm-sparc/auxvec.h>

include/asm-sparc64/backoff.h

-#include <asm-sparc/backoff.h>

include/asm-sparc64/bbc.h

-#include <asm-sparc/bbc.h>

include/asm-sparc64/bitops.h

-#include <asm-sparc/bitops.h>

include/asm-sparc64/bpp.h

-#include <asm-sparc/bpp.h>

include/asm-sparc64/bug.h

-#include <asm-sparc/bug.h>

include/asm-sparc64/bugs.h

-#include <asm-sparc/bugs.h>

include/asm-sparc64/byteorder.h

-#include <asm-sparc/byteorder.h>

include/asm-sparc64/cache.h

-#include <asm-sparc/cache.h>

include/asm-sparc64/cacheflush.h

-#include <asm-sparc/cacheflush.h>

include/asm-sparc64/chafsr.h

-#include <asm-sparc/chafsr.h>

include/asm-sparc64/checksum.h

-#include <asm-sparc/checksum.h>

include/asm-sparc64/chmctrl.h

-#include <asm-sparc/chmctrl.h>

include/asm-sparc64/cmt.h

-#include <asm-sparc/cmt.h>

include/asm-sparc64/compat.h

-#include <asm-sparc/compat.h>

include/asm-sparc64/compat_signal.h

-#include <asm-sparc/compat_signal.h>

include/asm-sparc64/cpudata.h

-#include <asm-sparc/cpudata.h>

include/asm-sparc64/cputime.h

-#include <asm-sparc/cputime.h>

include/asm-sparc64/current.h

-#include <asm-sparc/current.h>

include/asm-sparc64/dcr.h

-#include <asm-sparc/dcr.h>

include/asm-sparc64/dcu.h

-#include <asm-sparc/dcu.h>

include/asm-sparc64/delay.h

-#include <asm-sparc/delay.h>

include/asm-sparc64/device.h

-#include <asm-sparc/device.h>

include/asm-sparc64/display7seg.h

-#include <asm-sparc/display7seg.h>

include/asm-sparc64/div64.h

-#include <asm-sparc/div64.h>

include/asm-sparc64/dma-mapping.h

-#include <asm-sparc/dma-mapping.h>

include/asm-sparc64/dma.h

-#include <asm-sparc/dma.h>

include/asm-sparc64/ebus.h

-#include <asm-sparc/ebus.h>

include/asm-sparc64/elf.h

-#include <asm-sparc/elf.h>

include/asm-sparc64/emergency-restart.h

-#include <asm-sparc/emergency-restart.h>

include/asm-sparc64/envctrl.h

-#include <asm-sparc/envctrl.h>

include/asm-sparc64/errno.h

-#include <asm-sparc/errno.h>

include/asm-sparc64/estate.h

-#include <asm-sparc/estate.h>

include/asm-sparc64/fb.h

-#include <asm-sparc/fb.h>

include/asm-sparc64/fbio.h

-#include <asm-sparc/fbio.h>

include/asm-sparc64/fcntl.h

-#include <asm-sparc/fcntl.h>

include/asm-sparc64/fhc.h

-#include <asm-sparc/fhc.h>

include/asm-sparc64/floppy.h

-#include <asm-sparc/floppy.h>

include/asm-sparc64/fpumacro.h

-#include <asm-sparc/fpumacro.h>

include/asm-sparc64/futex.h

-#include <asm-sparc/futex.h>

include/asm-sparc64/hardirq.h

-#include <asm-sparc/hardirq.h>

include/asm-sparc64/head.h

-#include <asm-sparc/head.h>

include/asm-sparc64/hugetlb.h

-#include <asm-sparc/hugetlb.h>

include/asm-sparc64/hvtramp.h

-#include <asm-sparc/hvtramp.h>

include/asm-sparc64/hw_irq.h

-#include <asm-sparc/hw_irq.h>

include/asm-sparc64/hypervisor.h

-#include <asm-sparc/hypervisor.h>

include/asm-sparc64/ide.h

-#include <asm-sparc/ide.h>

include/asm-sparc64/idprom.h

-#include <asm-sparc/idprom.h>

include/asm-sparc64/intr_queue.h

-#include <asm-sparc/intr_queue.h>

include/asm-sparc64/io.h

-#include <asm-sparc/io.h>

include/asm-sparc64/ioctl.h

-#include <asm-sparc/ioctl.h>

include/asm-sparc64/ioctls.h

-#include <asm-sparc/ioctls.h>

include/asm-sparc64/iommu.h

-#include <asm-sparc/iommu.h>

include/asm-sparc64/ipcbuf.h

-#include <asm-sparc/ipcbuf.h>

include/asm-sparc64/irq.h

-#include <asm-sparc/irq.h>

include/asm-sparc64/irq_regs.h

-#include <asm-sparc/irq_regs.h>

include/asm-sparc64/irqflags.h

-#include <asm-sparc/irqflags.h>

include/asm-sparc64/kdebug.h

-#include <asm-sparc/kdebug.h>

include/asm-sparc64/kgdb.h

-#include <asm-sparc/kgdb.h>

include/asm-sparc64/kmap_types.h

-#include <asm-sparc/kmap_types.h>

include/asm-sparc64/kprobes.h

-#include <asm-sparc/kprobes.h>

include/asm-sparc64/ldc.h

-#include <asm-sparc/ldc.h>

include/asm-sparc64/linkage.h

-#include <asm-sparc/linkage.h>

include/asm-sparc64/lmb.h

-#include <asm-sparc/lmb.h>

include/asm-sparc64/local.h

-#include <asm-generic/local.h>

include/asm-sparc64/lsu.h

-#include <asm-sparc/lsu.h>

include/asm-sparc64/mc146818rtc.h

-#include <asm-sparc/mc146818rtc.h>

include/asm-sparc64/mdesc.h

-#include <asm-sparc/mdesc.h>

include/asm-sparc64/mman.h

-#include <asm-sparc/mman.h>

include/asm-sparc64/mmu.h

-#include <asm-sparc/mmu.h>

include/asm-sparc64/mmu_context.h

-#include <asm-sparc/mmu_context.h>

include/asm-sparc64/mmzone.h

-#include <asm-sparc/mmzone.h>

include/asm-sparc64/module.h

-#include <asm-sparc/module.h>

include/asm-sparc64/mostek.h

-#include <asm-sparc/mostek.h>

include/asm-sparc64/msgbuf.h

-#include <asm-sparc/msgbuf.h>

include/asm-sparc64/mutex.h

-#include <asm-sparc/mutex.h>

include/asm-sparc64/ns87303.h

-#include <asm-sparc/ns87303.h>

include/asm-sparc64/of_device.h

-#include <asm-sparc/of_device.h>

include/asm-sparc64/of_platform.h

-#include <asm-sparc/of_platform.h>

include/asm-sparc64/openprom.h

-#include <asm-sparc/openprom.h>

include/asm-sparc64/openpromio.h

-#include <asm-sparc/openpromio.h>

include/asm-sparc64/oplib.h

-#include <asm-sparc/oplib.h>

include/asm-sparc64/page.h

-#include <asm-sparc/page.h>

include/asm-sparc64/param.h

-#include <asm-sparc/param.h>

include/asm-sparc64/parport.h

-#include <asm-sparc/parport.h>

include/asm-sparc64/pci.h

-#include <asm-sparc/pci.h>

include/asm-sparc64/percpu.h

-#include <asm-sparc/percpu.h>

include/asm-sparc64/perfctr.h

-#include <asm-sparc/perfctr.h>

include/asm-sparc64/pgalloc.h

-#include <asm-sparc/pgalloc.h>

include/asm-sparc64/pgtable.h

-#include <asm-sparc/pgtable.h>

include/asm-sparc64/pil.h

-#include <asm-sparc/pil.h>

include/asm-sparc64/poll.h

-#include <asm-sparc/poll.h>

include/asm-sparc64/posix_types.h

-#include <asm-sparc/posix_types.h>

include/asm-sparc64/processor.h

-#include <asm-sparc/processor.h>

include/asm-sparc64/prom.h

-#include <asm-sparc/prom.h>

include/asm-sparc64/psrcompat.h

-#include <asm-sparc/psrcompat.h>

include/asm-sparc64/pstate.h

-#include <asm-sparc/pstate.h>

include/asm-sparc64/ptrace.h

-#include <asm-sparc/ptrace.h>

include/asm-sparc64/reboot.h

-#include <asm-sparc/reboot.h>

include/asm-sparc64/reg.h

-#include <asm-sparc/reg.h>

include/asm-sparc64/resource.h

-#include <asm-sparc/resource.h>

include/asm-sparc64/rtc.h

-#include <asm-sparc/rtc.h>

include/asm-sparc64/rwsem-const.h

-#include <asm-sparc/rwsem-const.h>

include/asm-sparc64/rwsem.h

-#include <asm-sparc/rwsem.h>

include/asm-sparc64/sbus.h

-#include <asm-sparc/sbus.h>

include/asm-sparc64/scatterlist.h

-#include <asm-sparc/scatterlist.h>

include/asm-sparc64/scratchpad.h

-#include <asm-sparc/scratchpad.h>

include/asm-sparc64/seccomp.h

-#include <asm-sparc/seccomp.h>

include/asm-sparc64/sections.h

-#include <asm-sparc/sections.h>

include/asm-sparc64/sembuf.h

-#include <asm-sparc/sembuf.h>

include/asm-sparc64/setup.h

-#include <asm-sparc/setup.h>

include/asm-sparc64/sfafsr.h

-#include <asm-sparc/sfafsr.h>

include/asm-sparc64/sfp-machine.h

-#include <asm-sparc/sfp-machine.h>

include/asm-sparc64/shmbuf.h

-#include <asm-sparc/shmbuf.h>

include/asm-sparc64/shmparam.h

-#include <asm-sparc/shmparam.h>

include/asm-sparc64/sigcontext.h

-#include <asm-sparc/sigcontext.h>

include/asm-sparc64/siginfo.h

-#include <asm-sparc/siginfo.h>

include/asm-sparc64/signal.h

-#include <asm-sparc/signal.h>

include/asm-sparc64/smp.h

-#include <asm-sparc/smp.h>

include/asm-sparc64/socket.h

-#include <asm-sparc/socket.h>

include/asm-sparc64/sockios.h

-#include <asm-sparc/sockios.h>

include/asm-sparc64/sparsemem.h

-#include <asm-sparc/sparsemem.h>

include/asm-sparc64/spinlock.h

-#include <asm-sparc/spinlock.h>

include/asm-sparc64/spinlock_types.h

-#include <asm-sparc/spinlock_types.h>

include/asm-sparc64/spitfire.h

-#include <asm-sparc/spitfire.h>

include/asm-sparc64/sstate.h

-#include <asm-sparc/sstate.h>

include/asm-sparc64/stacktrace.h

-#include <asm-sparc/stacktrace.h>

include/asm-sparc64/starfire.h

-#include <asm-sparc/starfire.h>

include/asm-sparc64/stat.h

-#include <asm-sparc/stat.h>

include/asm-sparc64/statfs.h

-#include <asm-sparc/statfs.h>

include/asm-sparc64/string.h

-#include <asm-sparc/string.h>

include/asm-sparc64/sunbpp.h

-#include <asm-sparc/sunbpp.h>

include/asm-sparc64/syscalls.h

-#include <asm-sparc/syscalls.h>

include/asm-sparc64/system.h

-#include <asm-sparc/system.h>

include/asm-sparc64/termbits.h

-#include <asm-sparc/termbits.h>

include/asm-sparc64/termios.h

-#include <asm-sparc/termios.h>

include/asm-sparc64/thread_info.h

-#include <asm-sparc/thread_info.h>

include/asm-sparc64/timer.h

-#include <asm-sparc/timer.h>

include/asm-sparc64/timex.h

-#include <asm-sparc/timex.h>

include/asm-sparc64/tlb.h

-#include <asm-sparc/tlb.h>

include/asm-sparc64/tlbflush.h

-#include <asm-sparc/tlbflush.h>

include/asm-sparc64/topology.h

-#include <asm-sparc/topology.h>

include/asm-sparc64/tsb.h

-#include <asm-sparc/tsb.h>

include/asm-sparc64/ttable.h

-#include <asm-sparc/ttable.h>

include/asm-sparc64/types.h

-#include <asm-sparc/types.h>

include/asm-sparc64/uaccess.h

-#include <asm-sparc/uaccess.h>

include/asm-sparc64/uctx.h

-#include <asm-sparc/uctx.h>

include/asm-sparc64/unaligned.h

-#include <asm-sparc/unaligned.h>

include/asm-sparc64/unistd.h

-#include <asm-sparc/unistd.h>

include/asm-sparc64/upa.h

-#include <asm-sparc/upa.h>

include/asm-sparc64/user.h

-#include <asm-sparc/user.h>

include/asm-sparc64/utrap.h

-#include <asm-sparc/utrap.h>

include/asm-sparc64/vga.h

-#include <asm-sparc/vga.h>

include/asm-sparc64/vio.h

-#include <asm-sparc/vio.h>

include/asm-sparc64/visasm.h

-#include <asm-sparc/visasm.h>

include/asm-sparc64/watchdog.h

-#include <asm-sparc/watchdog.h>

include/asm-sparc64/xor.h

-#include <asm-sparc/xor.h>