linux-kernel - [PATCH 15/39] MIPS: emma: Add header file path prefix

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1585558735-31535-1-git-send-email-maobibo@loongson.cn>
Date:   Mon, 30 Mar 2020 04:58:55 -0400
From:   bibo mao <maobibo@...ngson.cn>
To:     Thomas Bogendoerfer <tsbogend@...ha.franken.de>,
        Jiaxun Yang <jiaxun.yang@...goat.com>,
        Huacai Chen <chenhc@...ote.com>
Cc:     linux-mips@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH 15/39] MIPS: emma: Add header file path prefix

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

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

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 17e1131..cef1723 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1360,6 +1360,7 @@ config SOC_EMMA2RH
 	select SYS_SUPPORTS_32BIT_KERNEL
 	select SYS_SUPPORTS_64BIT_KERNEL
 	select SYS_SUPPORTS_BIG_ENDIAN
+	select HAVE_MACH_HEAD_FILES
 
 config SOC_PNX833X
 	bool
diff --git a/arch/mips/emma/Platform b/arch/mips/emma/Platform
index 0282f7f..f97aecf 100644
--- a/arch/mips/emma/Platform
+++ b/arch/mips/emma/Platform
@@ -1,4 +1,4 @@
 platform-$(CONFIG_SOC_EMMA2RH)	+= emma/
 cflags-$(CONFIG_SOC_EMMA2RH)	+=					\
-		-I$(srctree)/arch/mips/include/asm/mach-emma2rh
+		-I$(srctree)/arch/mips/emma/include
 load-$(CONFIG_NEC_MARKEINS)	+= 0xffffffff88100000
diff --git a/arch/mips/emma/include/mach/cpu-feature-overrides.h b/arch/mips/emma/include/mach/cpu-feature-overrides.h
new file mode 100644
index 0000000..f3e0e12
--- /dev/null
+++ b/arch/mips/emma/include/mach/cpu-feature-overrides.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/cpu-feature-overrides.h>
diff --git a/arch/mips/emma/include/mach/ioremap.h b/arch/mips/emma/include/mach/ioremap.h
new file mode 100644
index 0000000..2369393
--- /dev/null
+++ b/arch/mips/emma/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-emma2rh/irq.h b/arch/mips/emma/include/mach/irq.h
similarity index 100%
rename from arch/mips/include/asm/mach-emma2rh/irq.h
rename to arch/mips/emma/include/mach/irq.h
diff --git a/arch/mips/emma/include/mach/kernel-entry-init.h b/arch/mips/emma/include/mach/kernel-entry-init.h
new file mode 100644
index 0000000..19b872be
--- /dev/null
+++ b/arch/mips/emma/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/emma/include/mach/kmalloc.h b/arch/mips/emma/include/mach/kmalloc.h
new file mode 100644
index 0000000..4f056db
--- /dev/null
+++ b/arch/mips/emma/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/emma/include/mach/mangle-port.h b/arch/mips/emma/include/mach/mangle-port.h
new file mode 100644
index 0000000..b9736e3
--- /dev/null
+++ b/arch/mips/emma/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/emma/include/mach/mc146818rtc.h b/arch/mips/emma/include/mach/mc146818rtc.h
new file mode 100644
index 0000000..7284af8
--- /dev/null
+++ b/arch/mips/emma/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/emma/include/mach/spaces.h b/arch/mips/emma/include/mach/spaces.h
new file mode 100644
index 0000000..39a4d72
--- /dev/null
+++ b/arch/mips/emma/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/emma/include/mach/topology.h b/arch/mips/emma/include/mach/topology.h
new file mode 100644
index 0000000..86e585b
--- /dev/null
+++ b/arch/mips/emma/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/emma/include/mach/war.h b/arch/mips/emma/include/mach/war.h
new file mode 100644
index 0000000..5b0422a
--- /dev/null
+++ b/arch/mips/emma/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/emma/emma2rh.h b/arch/mips/include/asm/emma/emma2rh.h
index a25cdb3..2797f34 100644
--- a/arch/mips/include/asm/emma/emma2rh.h
+++ b/arch/mips/include/asm/emma/emma2rh.h
@@ -8,7 +8,7 @@
 #ifndef __ASM_EMMA_EMMA2RH_H
 #define __ASM_EMMA_EMMA2RH_H
 
-#include <irq.h>
+#include <mach/irq.h>
 
 /*
  * EMMA2RH registers
-- 
1.8.3.1