UAPI: (Scripted) Disintegrate arch/tile/include/arch
David Howells [Tue, 9 Oct 2012 08:47:45 +0000 (09:47 +0100)]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Dave Jones <davej@redhat.com>

20 files changed:
arch/tile/include/arch/Kbuild
arch/tile/include/arch/spr_def.h
arch/tile/include/uapi/arch/Kbuild
arch/tile/include/uapi/arch/abi.h [moved from arch/tile/include/arch/abi.h with 100% similarity]
arch/tile/include/uapi/arch/chip.h [moved from arch/tile/include/arch/chip.h with 100% similarity]
arch/tile/include/uapi/arch/chip_tile64.h [moved from arch/tile/include/arch/chip_tile64.h with 100% similarity]
arch/tile/include/uapi/arch/chip_tilegx.h [moved from arch/tile/include/arch/chip_tilegx.h with 100% similarity]
arch/tile/include/uapi/arch/chip_tilepro.h [moved from arch/tile/include/arch/chip_tilepro.h with 100% similarity]
arch/tile/include/uapi/arch/icache.h [moved from arch/tile/include/arch/icache.h with 100% similarity]
arch/tile/include/uapi/arch/interrupts.h [copied from arch/tile/include/arch/interrupts.h with 100% similarity]
arch/tile/include/uapi/arch/interrupts_32.h [moved from arch/tile/include/arch/interrupts_32.h with 100% similarity]
arch/tile/include/uapi/arch/interrupts_64.h [moved from arch/tile/include/arch/interrupts_64.h with 100% similarity]
arch/tile/include/uapi/arch/opcode.h [moved from arch/tile/include/arch/opcode.h with 100% similarity]
arch/tile/include/uapi/arch/opcode_tilegx.h [moved from arch/tile/include/arch/opcode_tilegx.h with 100% similarity]
arch/tile/include/uapi/arch/opcode_tilepro.h [moved from arch/tile/include/arch/opcode_tilepro.h with 100% similarity]
arch/tile/include/uapi/arch/sim.h [moved from arch/tile/include/arch/sim.h with 100% similarity]
arch/tile/include/uapi/arch/sim_def.h [moved from arch/tile/include/arch/sim_def.h with 100% similarity]
arch/tile/include/uapi/arch/spr_def.h [moved from arch/tile/include/arch/interrupts.h with 73% similarity]
arch/tile/include/uapi/arch/spr_def_32.h [moved from arch/tile/include/arch/spr_def_32.h with 98% similarity]
arch/tile/include/uapi/arch/spr_def_64.h [moved from arch/tile/include/arch/spr_def_64.h with 98% similarity]

index 9c0ea24..e69de29 100644 (file)
@@ -1,17 +0,0 @@
-header-y += abi.h
-header-y += chip.h
-header-y += chip_tile64.h
-header-y += chip_tilegx.h
-header-y += chip_tilepro.h
-header-y += icache.h
-header-y += interrupts.h
-header-y += interrupts_32.h
-header-y += interrupts_64.h
-header-y += opcode.h
-header-y += opcode_tilegx.h
-header-y += opcode_tilepro.h
-header-y += sim.h
-header-y += sim_def.h
-header-y += spr_def.h
-header-y += spr_def_32.h
-header-y += spr_def_64.h
index d6ba449..2de83e7 100644 (file)
  *   NON INFRINGEMENT.  See the GNU General Public License for
  *   more details.
  */
+#ifndef __ARCH_SPR_DEF_H__
+#define __ARCH_SPR_DEF_H__
 
-/* Include the proper base SPR definition file. */
-#ifdef __tilegx__
-#include <arch/spr_def_64.h>
-#else
-#include <arch/spr_def_32.h>
-#endif
+#include <uapi/arch/spr_def.h>
 
-#ifdef __KERNEL__
 
 /*
  * In addition to including the proper base SPR definition file, depending
 #define INT_INTCTRL_K \
        _concat4(INT_INTCTRL_, CONFIG_KERNEL_PL,,)
 
-#endif /* __KERNEL__ */
+#endif /* __ARCH_SPR_DEF_H__ */
index aafaa5a..4ebc34f 100644 (file)
@@ -1 +1,18 @@
 # UAPI Header export list
+header-y += abi.h
+header-y += chip.h
+header-y += chip_tile64.h
+header-y += chip_tilegx.h
+header-y += chip_tilepro.h
+header-y += icache.h
+header-y += interrupts.h
+header-y += interrupts_32.h
+header-y += interrupts_64.h
+header-y += opcode.h
+header-y += opcode_tilegx.h
+header-y += opcode_tilepro.h
+header-y += sim.h
+header-y += sim_def.h
+header-y += spr_def.h
+header-y += spr_def_32.h
+header-y += spr_def_64.h
similarity index 73%
rename from arch/tile/include/arch/interrupts.h
rename to arch/tile/include/uapi/arch/spr_def.h
index 20f8f07..c250c5a 100644 (file)
  *   more details.
  */
 
+#ifndef _UAPI__ARCH_SPR_DEF_H__
+#define _UAPI__ARCH_SPR_DEF_H__
+
+/* Include the proper base SPR definition file. */
 #ifdef __tilegx__
-#include <arch/interrupts_64.h>
+#include <arch/spr_def_64.h>
 #else
-#include <arch/interrupts_32.h>
+#include <arch/spr_def_32.h>
 #endif
+
+
+#endif /* _UAPI__ARCH_SPR_DEF_H__ */
similarity index 98%
rename from arch/tile/include/arch/spr_def_32.h
rename to arch/tile/include/uapi/arch/spr_def_32.h
index 78bbce2..c689446 100644 (file)
@@ -14,8 +14,8 @@
 
 #ifndef __DOXYGEN__
 
-#ifndef __ARCH_SPR_DEF_H__
-#define __ARCH_SPR_DEF_H__
+#ifndef __ARCH_SPR_DEF_32_H__
+#define __ARCH_SPR_DEF_32_H__
 
 #define SPR_AUX_PERF_COUNT_0 0x6005
 #define SPR_AUX_PERF_COUNT_1 0x6006
 #define SPR_WATCH_MASK 0x420a
 #define SPR_WATCH_VAL 0x420b
 
-#endif /* !defined(__ARCH_SPR_DEF_H__) */
+#endif /* !defined(__ARCH_SPR_DEF_32_H__) */
 
 #endif /* !defined(__DOXYGEN__) */
similarity index 98%
rename from arch/tile/include/arch/spr_def_64.h
rename to arch/tile/include/uapi/arch/spr_def_64.h
index 0da86fa..67a6c17 100644 (file)
@@ -14,8 +14,8 @@
 
 #ifndef __DOXYGEN__
 
-#ifndef __ARCH_SPR_DEF_H__
-#define __ARCH_SPR_DEF_H__
+#ifndef __ARCH_SPR_DEF_64_H__
+#define __ARCH_SPR_DEF_64_H__
 
 #define SPR_AUX_PERF_COUNT_0 0x2105
 #define SPR_AUX_PERF_COUNT_1 0x2106
 #define SPR_WATCH_MASK 0x200a
 #define SPR_WATCH_VAL 0x200b
 
-#endif /* !defined(__ARCH_SPR_DEF_H__) */
+#endif /* !defined(__ARCH_SPR_DEF_64_H__) */
 
 #endif /* !defined(__DOXYGEN__) */