From 43e858598a1a3d0a9352515f847c04e80942ca4a Mon Sep 17 00:00:00 2001 From: David Howells Date: Tue, 9 Oct 2012 09:47:45 +0100 Subject: [PATCH] UAPI: (Scripted) Disintegrate arch/tile/include/arch Signed-off-by: David Howells Acked-by: Arnd Bergmann Acked-by: Thomas Gleixner Acked-by: Michael Kerrisk Acked-by: Paul E. McKenney Acked-by: Dave Jones --- arch/tile/include/arch/Kbuild | 17 ------------ arch/tile/include/arch/spr_def.h | 12 +++------ arch/tile/include/uapi/arch/Kbuild | 17 ++++++++++++ arch/tile/include/{ => uapi}/arch/abi.h | 0 arch/tile/include/{ => uapi}/arch/chip.h | 0 .../include/{ => uapi}/arch/chip_tile64.h | 0 .../include/{ => uapi}/arch/chip_tilegx.h | 0 .../include/{ => uapi}/arch/chip_tilepro.h | 0 arch/tile/include/{ => uapi}/arch/icache.h | 0 .../tile/include/{ => uapi}/arch/interrupts.h | 0 .../include/{ => uapi}/arch/interrupts_32.h | 0 .../include/{ => uapi}/arch/interrupts_64.h | 0 arch/tile/include/{ => uapi}/arch/opcode.h | 0 .../include/{ => uapi}/arch/opcode_tilegx.h | 0 .../include/{ => uapi}/arch/opcode_tilepro.h | 0 arch/tile/include/{ => uapi}/arch/sim.h | 0 arch/tile/include/{ => uapi}/arch/sim_def.h | 0 arch/tile/include/uapi/arch/spr_def.h | 26 +++++++++++++++++++ .../tile/include/{ => uapi}/arch/spr_def_32.h | 6 ++--- .../tile/include/{ => uapi}/arch/spr_def_64.h | 6 ++--- 20 files changed, 53 insertions(+), 31 deletions(-) rename arch/tile/include/{ => uapi}/arch/abi.h (100%) rename arch/tile/include/{ => uapi}/arch/chip.h (100%) rename arch/tile/include/{ => uapi}/arch/chip_tile64.h (100%) rename arch/tile/include/{ => uapi}/arch/chip_tilegx.h (100%) rename arch/tile/include/{ => uapi}/arch/chip_tilepro.h (100%) rename arch/tile/include/{ => uapi}/arch/icache.h (100%) rename arch/tile/include/{ => uapi}/arch/interrupts.h (100%) rename arch/tile/include/{ => uapi}/arch/interrupts_32.h (100%) rename arch/tile/include/{ => uapi}/arch/interrupts_64.h (100%) rename arch/tile/include/{ => uapi}/arch/opcode.h (100%) rename arch/tile/include/{ => uapi}/arch/opcode_tilegx.h (100%) rename arch/tile/include/{ => uapi}/arch/opcode_tilepro.h (100%) rename arch/tile/include/{ => uapi}/arch/sim.h (100%) rename arch/tile/include/{ => uapi}/arch/sim_def.h (100%) create mode 100644 arch/tile/include/uapi/arch/spr_def.h rename arch/tile/include/{ => uapi}/arch/spr_def_32.h (98%) rename arch/tile/include/{ => uapi}/arch/spr_def_64.h (98%) diff --git a/arch/tile/include/arch/Kbuild b/arch/tile/include/arch/Kbuild index 9c0ea24cc948..e69de29bb2d1 100644 --- a/arch/tile/include/arch/Kbuild +++ b/arch/tile/include/arch/Kbuild @@ -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 diff --git a/arch/tile/include/arch/spr_def.h b/arch/tile/include/arch/spr_def.h index d6ba449b5363..2de83e7aff3e 100644 --- a/arch/tile/include/arch/spr_def.h +++ b/arch/tile/include/arch/spr_def.h @@ -11,15 +11,11 @@ * 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 -#else -#include -#endif +#include -#ifdef __KERNEL__ /* * In addition to including the proper base SPR definition file, depending @@ -110,4 +106,4 @@ #define INT_INTCTRL_K \ _concat4(INT_INTCTRL_, CONFIG_KERNEL_PL,,) -#endif /* __KERNEL__ */ +#endif /* __ARCH_SPR_DEF_H__ */ diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild index aafaa5aa54d4..4ebc34f4768d 100644 --- a/arch/tile/include/uapi/arch/Kbuild +++ b/arch/tile/include/uapi/arch/Kbuild @@ -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 diff --git a/arch/tile/include/arch/abi.h b/arch/tile/include/uapi/arch/abi.h similarity index 100% rename from arch/tile/include/arch/abi.h rename to arch/tile/include/uapi/arch/abi.h diff --git a/arch/tile/include/arch/chip.h b/arch/tile/include/uapi/arch/chip.h similarity index 100% rename from arch/tile/include/arch/chip.h rename to arch/tile/include/uapi/arch/chip.h diff --git a/arch/tile/include/arch/chip_tile64.h b/arch/tile/include/uapi/arch/chip_tile64.h similarity index 100% rename from arch/tile/include/arch/chip_tile64.h rename to arch/tile/include/uapi/arch/chip_tile64.h diff --git a/arch/tile/include/arch/chip_tilegx.h b/arch/tile/include/uapi/arch/chip_tilegx.h similarity index 100% rename from arch/tile/include/arch/chip_tilegx.h rename to arch/tile/include/uapi/arch/chip_tilegx.h diff --git a/arch/tile/include/arch/chip_tilepro.h b/arch/tile/include/uapi/arch/chip_tilepro.h similarity index 100% rename from arch/tile/include/arch/chip_tilepro.h rename to arch/tile/include/uapi/arch/chip_tilepro.h diff --git a/arch/tile/include/arch/icache.h b/arch/tile/include/uapi/arch/icache.h similarity index 100% rename from arch/tile/include/arch/icache.h rename to arch/tile/include/uapi/arch/icache.h diff --git a/arch/tile/include/arch/interrupts.h b/arch/tile/include/uapi/arch/interrupts.h similarity index 100% rename from arch/tile/include/arch/interrupts.h rename to arch/tile/include/uapi/arch/interrupts.h diff --git a/arch/tile/include/arch/interrupts_32.h b/arch/tile/include/uapi/arch/interrupts_32.h similarity index 100% rename from arch/tile/include/arch/interrupts_32.h rename to arch/tile/include/uapi/arch/interrupts_32.h diff --git a/arch/tile/include/arch/interrupts_64.h b/arch/tile/include/uapi/arch/interrupts_64.h similarity index 100% rename from arch/tile/include/arch/interrupts_64.h rename to arch/tile/include/uapi/arch/interrupts_64.h diff --git a/arch/tile/include/arch/opcode.h b/arch/tile/include/uapi/arch/opcode.h similarity index 100% rename from arch/tile/include/arch/opcode.h rename to arch/tile/include/uapi/arch/opcode.h diff --git a/arch/tile/include/arch/opcode_tilegx.h b/arch/tile/include/uapi/arch/opcode_tilegx.h similarity index 100% rename from arch/tile/include/arch/opcode_tilegx.h rename to arch/tile/include/uapi/arch/opcode_tilegx.h diff --git a/arch/tile/include/arch/opcode_tilepro.h b/arch/tile/include/uapi/arch/opcode_tilepro.h similarity index 100% rename from arch/tile/include/arch/opcode_tilepro.h rename to arch/tile/include/uapi/arch/opcode_tilepro.h diff --git a/arch/tile/include/arch/sim.h b/arch/tile/include/uapi/arch/sim.h similarity index 100% rename from arch/tile/include/arch/sim.h rename to arch/tile/include/uapi/arch/sim.h diff --git a/arch/tile/include/arch/sim_def.h b/arch/tile/include/uapi/arch/sim_def.h similarity index 100% rename from arch/tile/include/arch/sim_def.h rename to arch/tile/include/uapi/arch/sim_def.h diff --git a/arch/tile/include/uapi/arch/spr_def.h b/arch/tile/include/uapi/arch/spr_def.h new file mode 100644 index 000000000000..c250c5adb1a6 --- /dev/null +++ b/arch/tile/include/uapi/arch/spr_def.h @@ -0,0 +1,26 @@ +/* + * Copyright 2010 Tilera Corporation. All Rights Reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or + * NON INFRINGEMENT. See the GNU General Public License for + * more details. + */ + +#ifndef _UAPI__ARCH_SPR_DEF_H__ +#define _UAPI__ARCH_SPR_DEF_H__ + +/* Include the proper base SPR definition file. */ +#ifdef __tilegx__ +#include +#else +#include +#endif + + +#endif /* _UAPI__ARCH_SPR_DEF_H__ */ diff --git a/arch/tile/include/arch/spr_def_32.h b/arch/tile/include/uapi/arch/spr_def_32.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 78bbce2fb19a..c689446e6284 100644 --- a/arch/tile/include/arch/spr_def_32.h +++ b/arch/tile/include/uapi/arch/spr_def_32.h @@ -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 @@ -252,6 +252,6 @@ #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__) */ diff --git a/arch/tile/include/arch/spr_def_64.h b/arch/tile/include/uapi/arch/spr_def_64.h 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 0da86faa3370..67a6c1751e3b 100644 --- a/arch/tile/include/arch/spr_def_64.h +++ b/arch/tile/include/uapi/arch/spr_def_64.h @@ -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 @@ -211,6 +211,6 @@ #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__) */ -- 2.20.1