[PATCH 14/39] MIPS: dec: Add header file path prefix

From: bibo mao
Date: Mon Mar 30 2020 - 04:53:52 EST


Remove header files from arch/mips/include/asm/mach-dec
to arch/mips/dec/include/mach

Signed-off-by: bibo mao <maobibo@xxxxxxxxxxx>
---
arch/mips/Kconfig | 1 +
arch/mips/dec/Platform | 2 +-
.../{include/asm/mach-dec => dec/include/mach}/cpu-feature-overrides.h | 0
arch/mips/dec/include/mach/ioremap.h | 2 ++
arch/mips/dec/include/mach/irq.h | 2 ++
arch/mips/dec/include/mach/kernel-entry-init.h | 2 ++
arch/mips/dec/include/mach/kmalloc.h | 2 ++
arch/mips/dec/include/mach/mangle-port.h | 2 ++
arch/mips/{include/asm/mach-dec => dec/include/mach}/mc146818rtc.h | 0
arch/mips/dec/include/mach/spaces.h | 2 ++
arch/mips/dec/include/mach/topology.h | 2 ++
arch/mips/dec/include/mach/war.h | 2 ++
arch/mips/include/asm/dec/interrupts.h | 2 +-
13 files changed, 19 insertions(+), 2 deletions(-)
rename arch/mips/{include/asm/mach-dec => dec/include/mach}/cpu-feature-overrides.h (100%)
create mode 100644 arch/mips/dec/include/mach/ioremap.h
create mode 100644 arch/mips/dec/include/mach/irq.h
create mode 100644 arch/mips/dec/include/mach/kernel-entry-init.h
create mode 100644 arch/mips/dec/include/mach/kmalloc.h
create mode 100644 arch/mips/dec/include/mach/mangle-port.h
rename arch/mips/{include/asm/mach-dec => dec/include/mach}/mc146818rtc.h (100%)
create mode 100644 arch/mips/dec/include/mach/spaces.h
create mode 100644 arch/mips/dec/include/mach/topology.h
create mode 100644 arch/mips/dec/include/mach/war.h

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index ba7e065..17e1131 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -353,6 +353,7 @@ config MACH_DECSTATION
select SYS_SUPPORTS_256HZ
select SYS_SUPPORTS_1024HZ
select MIPS_L1_CACHE_SHIFT_4
+ select HAVE_MACH_HEAD_FILES
help
This enables support for DEC's MIPS based workstations. For details
see the Linux/MIPS FAQ on <http://www.linux-mips.org/> and the
diff --git a/arch/mips/dec/Platform b/arch/mips/dec/Platform
index cf55a6f..f450c99 100644
--- a/arch/mips/dec/Platform
+++ b/arch/mips/dec/Platform
@@ -3,6 +3,6 @@
#
platform-$(CONFIG_MACH_DECSTATION) += dec/
cflags-$(CONFIG_MACH_DECSTATION) += \
- -I$(srctree)/arch/mips/include/asm/mach-dec
+ -I$(srctree)/arch/mips/dec/include
libs-$(CONFIG_MACH_DECSTATION) += arch/mips/dec/prom/
load-$(CONFIG_MACH_DECSTATION) += 0xffffffff80040000
diff --git a/arch/mips/include/asm/mach-dec/cpu-feature-overrides.h b/arch/mips/dec/include/mach/cpu-feature-overrides.h
similarity index 100%
rename from arch/mips/include/asm/mach-dec/cpu-feature-overrides.h
rename to arch/mips/dec/include/mach/cpu-feature-overrides.h
diff --git a/arch/mips/dec/include/mach/ioremap.h b/arch/mips/dec/include/mach/ioremap.h
new file mode 100644
index 0000000..2369393
--- /dev/null
+++ b/arch/mips/dec/include/mach/ioremap.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/ioremap.h>
diff --git a/arch/mips/dec/include/mach/irq.h b/arch/mips/dec/include/mach/irq.h
new file mode 100644
index 0000000..bb5ccce
--- /dev/null
+++ b/arch/mips/dec/include/mach/irq.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/irq.h>
diff --git a/arch/mips/dec/include/mach/kernel-entry-init.h b/arch/mips/dec/include/mach/kernel-entry-init.h
new file mode 100644
index 0000000..19b872be
--- /dev/null
+++ b/arch/mips/dec/include/mach/kernel-entry-init.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/kernel-entry-init.h>
diff --git a/arch/mips/dec/include/mach/kmalloc.h b/arch/mips/dec/include/mach/kmalloc.h
new file mode 100644
index 0000000..4f056db
--- /dev/null
+++ b/arch/mips/dec/include/mach/kmalloc.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/kmalloc.h>
diff --git a/arch/mips/dec/include/mach/mangle-port.h b/arch/mips/dec/include/mach/mangle-port.h
new file mode 100644
index 0000000..b9736e3
--- /dev/null
+++ b/arch/mips/dec/include/mach/mangle-port.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/mangle-port.h>
diff --git a/arch/mips/include/asm/mach-dec/mc146818rtc.h b/arch/mips/dec/include/mach/mc146818rtc.h
similarity index 100%
rename from arch/mips/include/asm/mach-dec/mc146818rtc.h
rename to arch/mips/dec/include/mach/mc146818rtc.h
diff --git a/arch/mips/dec/include/mach/spaces.h b/arch/mips/dec/include/mach/spaces.h
new file mode 100644
index 0000000..39a4d72
--- /dev/null
+++ b/arch/mips/dec/include/mach/spaces.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/spaces.h>
diff --git a/arch/mips/dec/include/mach/topology.h b/arch/mips/dec/include/mach/topology.h
new file mode 100644
index 0000000..86e585b
--- /dev/null
+++ b/arch/mips/dec/include/mach/topology.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/topology.h>
diff --git a/arch/mips/dec/include/mach/war.h b/arch/mips/dec/include/mach/war.h
new file mode 100644
index 0000000..5b0422a
--- /dev/null
+++ b/arch/mips/dec/include/mach/war.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/war.h>
diff --git a/arch/mips/include/asm/dec/interrupts.h b/arch/mips/include/asm/dec/interrupts.h
index e10d341..a2206e1 100644
--- a/arch/mips/include/asm/dec/interrupts.h
+++ b/arch/mips/include/asm/dec/interrupts.h
@@ -14,7 +14,7 @@
#ifndef __ASM_DEC_INTERRUPTS_H
#define __ASM_DEC_INTERRUPTS_H

-#include <irq.h>
+#include <mach/irq.h>
#include <asm/mipsregs.h>


--
1.8.3.1