[RFC PATCH 4/8] powerpc: remove superflous inclusions of asm/feature-fixups.h
From: Christophe Leroy
Date: Wed May 30 2018 - 12:42:04 EST
files not using feature fixup don't need asm/feature-fixups.h
Signed-off-by: Christophe Leroy <christophe.leroy@xxxxxx>
---
arch/powerpc/include/asm/cputable.h | 1 -
arch/powerpc/include/asm/firmware.h | 1 -
arch/powerpc/include/asm/mmu.h | 1 -
arch/powerpc/include/asm/reg.h | 1 +
4 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h
index 7518dafa7cd4..e99905274a77 100644
--- a/arch/powerpc/include/asm/cputable.h
+++ b/arch/powerpc/include/asm/cputable.h
@@ -4,7 +4,6 @@
#include <linux/types.h>
-#include <asm/feature-fixups.h>
#include <uapi/asm/cputable.h>
#ifndef __ASSEMBLY__
diff --git a/arch/powerpc/include/asm/firmware.h b/arch/powerpc/include/asm/firmware.h
index 535add3f7791..59ae44cf0bb8 100644
--- a/arch/powerpc/include/asm/firmware.h
+++ b/arch/powerpc/include/asm/firmware.h
@@ -15,7 +15,6 @@
#ifdef __KERNEL__
#include <asm/asm-compat.h>
-#include <asm/feature-fixups.h>
/* firmware feature bitmask values */
diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h
index 61d15ce92278..61d0d2d69583 100644
--- a/arch/powerpc/include/asm/mmu.h
+++ b/arch/powerpc/include/asm/mmu.h
@@ -6,7 +6,6 @@
#include <linux/types.h>
#include <asm/asm-compat.h>
-#include <asm/feature-fixups.h>
/*
* MMU features bit definitions
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index cb0f272ce123..a7b8860ed896 100644
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -13,6 +13,7 @@
#include <linux/stringify.h>
#include <asm/cputable.h>
+#include <asm/feature-fixups.h>
/* Pickup Book E specific registers. */
#if defined(CONFIG_BOOKE) || defined(CONFIG_40x)
--
2.13.3