diff mbox series

[18/39] MIPS: ip27: Add header file path prefix

Message ID 1585558753-18285-1-git-send-email-maobibo@loongson.cn (mailing list archive)
State Rejected
Headers show
Series None | expand

Commit Message

Bibo Mao March 30, 2020, 8:59 a.m. UTC 
Remove header files from arch/mips/include/asm/mach-ip27
o arch/mips/sgi-ip27/include/mach

Signed-off-by: bibo mao <maobibo@loongson.cn>
---
 arch/mips/Kconfig                                                       | 1 +
 arch/mips/sgi-ip27/Platform                                             | 2 +-
 .../asm/mach-ip27 => sgi-ip27/include/mach}/cpu-feature-overrides.h     | 0
 arch/mips/sgi-ip27/include/mach/ioremap.h                               | 2 ++
 arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/irq.h        | 0
 .../asm/mach-ip27 => sgi-ip27/include/mach}/kernel-entry-init.h         | 0
 arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/kmalloc.h    | 0
 .../mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/mangle-port.h | 0
 arch/mips/sgi-ip27/include/mach/mc146818rtc.h                           | 2 ++
 arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/mmzone.h     | 0
 arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/spaces.h     | 0
 arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/topology.h   | 0
 arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/war.h        | 0
 13 files changed, 6 insertions(+), 1 deletion(-)
 rename arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/cpu-feature-overrides.h (100%)
 create mode 100644 arch/mips/sgi-ip27/include/mach/ioremap.h
 rename arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/irq.h (100%)
 rename arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/kernel-entry-init.h (100%)
 rename arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/kmalloc.h (100%)
 rename arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/mangle-port.h (100%)
 create mode 100644 arch/mips/sgi-ip27/include/mach/mc146818rtc.h
 rename arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/mmzone.h (100%)
 rename arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/spaces.h (100%)
 rename arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/topology.h (100%)
 rename arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/war.h (100%)
diff mbox series

Patch

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index aad4a68..48fd625 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -735,6 +735,7 @@  config SGI_IP27
 	select SYS_SUPPORTS_NUMA
 	select SYS_SUPPORTS_SMP
 	select MIPS_L1_CACHE_SHIFT_7
+	select HAVE_MACH_HEAD_FILES
 	help
 	  This are the SGI Origin 200, Origin 2000 and Onyx 2 Graphics
 	  workstations.  To compile a Linux kernel that runs on these, say Y
diff --git a/arch/mips/sgi-ip27/Platform b/arch/mips/sgi-ip27/Platform
index 1fb9c2e..5d37446 100644
--- a/arch/mips/sgi-ip27/Platform
+++ b/arch/mips/sgi-ip27/Platform
@@ -7,7 +7,7 @@ 
 #
 ifdef CONFIG_SGI_IP27
 platform-$(CONFIG_SGI_IP27)	+= sgi-ip27/
-cflags-$(CONFIG_SGI_IP27)	+= -I$(srctree)/arch/mips/include/asm/mach-ip27
+cflags-$(CONFIG_SGI_IP27)	+= -I$(srctree)/arch/mips/sgi-ip27/include
 ifdef CONFIG_MAPPED_KERNEL
 load-$(CONFIG_SGI_IP27)		+= 0xc00000004001c000
 OBJCOPYFLAGS			:= --change-addresses=0x3fffffff80000000
diff --git a/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h b/arch/mips/sgi-ip27/include/mach/cpu-feature-overrides.h
similarity index 100%
rename from arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h
rename to arch/mips/sgi-ip27/include/mach/cpu-feature-overrides.h
diff --git a/arch/mips/sgi-ip27/include/mach/ioremap.h b/arch/mips/sgi-ip27/include/mach/ioremap.h
new file mode 100644
index 0000000..2369393
--- /dev/null
+++ b/arch/mips/sgi-ip27/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/include/asm/mach-ip27/irq.h b/arch/mips/sgi-ip27/include/mach/irq.h
similarity index 100%
rename from arch/mips/include/asm/mach-ip27/irq.h
rename to arch/mips/sgi-ip27/include/mach/irq.h
diff --git a/arch/mips/include/asm/mach-ip27/kernel-entry-init.h b/arch/mips/sgi-ip27/include/mach/kernel-entry-init.h
similarity index 100%
rename from arch/mips/include/asm/mach-ip27/kernel-entry-init.h
rename to arch/mips/sgi-ip27/include/mach/kernel-entry-init.h
diff --git a/arch/mips/include/asm/mach-ip27/kmalloc.h b/arch/mips/sgi-ip27/include/mach/kmalloc.h
similarity index 100%
rename from arch/mips/include/asm/mach-ip27/kmalloc.h
rename to arch/mips/sgi-ip27/include/mach/kmalloc.h
diff --git a/arch/mips/include/asm/mach-ip27/mangle-port.h b/arch/mips/sgi-ip27/include/mach/mangle-port.h
similarity index 100%
rename from arch/mips/include/asm/mach-ip27/mangle-port.h
rename to arch/mips/sgi-ip27/include/mach/mangle-port.h
diff --git a/arch/mips/sgi-ip27/include/mach/mc146818rtc.h b/arch/mips/sgi-ip27/include/mach/mc146818rtc.h
new file mode 100644
index 0000000..7284af8
--- /dev/null
+++ b/arch/mips/sgi-ip27/include/mach/mc146818rtc.h
@@ -0,0 +1,2 @@ 
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/mc146818rtc.h>
diff --git a/arch/mips/include/asm/mach-ip27/mmzone.h b/arch/mips/sgi-ip27/include/mach/mmzone.h
similarity index 100%
rename from arch/mips/include/asm/mach-ip27/mmzone.h
rename to arch/mips/sgi-ip27/include/mach/mmzone.h
diff --git a/arch/mips/include/asm/mach-ip27/spaces.h b/arch/mips/sgi-ip27/include/mach/spaces.h
similarity index 100%
rename from arch/mips/include/asm/mach-ip27/spaces.h
rename to arch/mips/sgi-ip27/include/mach/spaces.h
diff --git a/arch/mips/include/asm/mach-ip27/topology.h b/arch/mips/sgi-ip27/include/mach/topology.h
similarity index 100%
rename from arch/mips/include/asm/mach-ip27/topology.h
rename to arch/mips/sgi-ip27/include/mach/topology.h
diff --git a/arch/mips/include/asm/mach-ip27/war.h b/arch/mips/sgi-ip27/include/mach/war.h
similarity index 100%
rename from arch/mips/include/asm/mach-ip27/war.h
rename to arch/mips/sgi-ip27/include/mach/war.h