| Message ID | 20200916030234.4110379-1-npiggin@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9983efa83b0a98da33807ccf5c047e204fdcac4c |
| Headers | show |
| Series | [v2,1/2] powerpc: untangle cputable mce include | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (27e2fbcd815a088d7d83c7158f76b6e95ab07c50) |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 25 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
On Wed, 16 Sep 2020 13:02:33 +1000, Nicholas Piggin wrote: > Having cputable.h include mce.h means it pulls in a bunch of low level > headers (e.g., synch.h) which then can't use CPU_FTR_ definitions. Applied to powerpc/next. [1/2] powerpc: untangle cputable mce include https://git.kernel.org/powerpc/c/9983efa83b0a98da33807ccf5c047e204fdcac4c [2/2] powerpc/64s: Add cp_abort after tlbiel to invalidate copy-buffer address https://git.kernel.org/powerpc/c/05504b42562066ae27ce3e7dcec37f81dea476cb cheers
diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h index 32a15dc49e8c..f89205eff691 100644 --- a/arch/powerpc/include/asm/cputable.h +++ b/arch/powerpc/include/asm/cputable.h @@ -9,11 +9,6 @@ #ifndef __ASSEMBLY__ -/* - * Added to include __machine_check_early_realmode_* functions - */ -#include <asm/mce.h> - /* This structure can grow, it's real size is used by head.S code * via the mkdefs mechanism. */ diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index 2aa89c6b2896..b5bc2edef440 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c @@ -16,6 +16,7 @@ #include <asm/oprofile_impl.h> #include <asm/cputable.h> #include <asm/prom.h> /* for PTRRELOC on ARCH=ppc */ +#include <asm/mce.h> #include <asm/mmu.h> #include <asm/setup.h> diff --git a/arch/powerpc/kernel/dt_cpu_ftrs.c b/arch/powerpc/kernel/dt_cpu_ftrs.c index f204ad79b6b5..1098863e17ee 100644 --- a/arch/powerpc/kernel/dt_cpu_ftrs.c +++ b/arch/powerpc/kernel/dt_cpu_ftrs.c @@ -17,6 +17,7 @@ #include <asm/cputable.h> #include <asm/dt_cpu_ftrs.h> +#include <asm/mce.h> #include <asm/mmu.h> #include <asm/oprofile_impl.h> #include <asm/prom.h>
Having cputable.h include mce.h means it pulls in a bunch of low level headers (e.g., synch.h) which then can't use CPU_FTR_ definitions. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- arch/powerpc/include/asm/cputable.h | 5 ----- arch/powerpc/kernel/cputable.c | 1 + arch/powerpc/kernel/dt_cpu_ftrs.c | 1 + 3 files changed, 2 insertions(+), 5 deletions(-)