MIPS: generic: Fix compilation error from include asm/mips-cpc.h
authorMatt Redfearn <matt.redfearn@mips.com>
Mon, 16 Oct 2017 10:06:49 +0000 (11:06 +0100)
committerJames Hogan <jhogan@kernel.org>
Tue, 31 Oct 2017 23:49:48 +0000 (23:49 +0000)
commit7f005f112f527f0762386c6fd182966d0e066eaf
treeef282f2f69fdc5f31795b878a7ea5424306bbce7
parentc496f3c08a83e57359509828e5b19eeb920b81b1
MIPS: generic: Fix compilation error from include asm/mips-cpc.h

Commit e83f7e02af50c ("MIPS: CPS: Have asm/mips-cps.h include CM & CPC
headers") adds a #error to arch/mips/include/asm/mips-cpc.h if it is
included directly. While this commit replaced almost all direct includes
of mips-cm.h and mips-cpc.h, 2 remain.

With some defconfigs, mips-cps.h is indirectly included before
mips-cpc.h, but in others this results in compilation errors:

In file included from arch/mips/generic/init.c:23:0:
./arch/mips/include/asm/mips-cpc.h:12:3: error: #error Please include
asm/mips-cps.h rather than asm/mips-cpc.h
 # error Please include asm/mips-cps.h rather than asm/mips-cpc.h

In file included from arch/mips/kernel/smp.c:23:0:
./arch/mips/include/asm/mips-cpc.h:12:3: error: #error Please include
asm/mips-cps.h rather than asm/mips-cpc.h
 # error Please include asm/mips-cps.h rather than asm/mips-cpc.h

In both cases, fix this by including mips-cps.h instead.

Fixes: e83f7e02af50c ("MIPS: CPS: Have asm/mips-cps.h include CM & CPC headers")
Signed-off-by: Matt Redfearn <matt.redfearn@mips.com>
Patchwork: https://patchwork.linux-mips.org/patch/17492/
Signed-off-by: James Hogan <jhogan@kernel.org>
arch/mips/generic/init.c
arch/mips/kernel/smp.c