Skip to content

Commit d2d72c0

Browse files
paulburtongregkh
authored andcommitted
MIPS: Netlogic: Exclude netlogic,xlp-pic code from XLR builds
[ Upstream commit 9799270affc53414da96e77e454a5616b39cdab0 ] Code in arch/mips/netlogic/common/irq.c which handles the XLP PIC fails to build in XLR configurations due to cpu_is_xlp9xx not being defined, leading to the following build failure: arch/mips/netlogic/common/irq.c: In function ‘xlp_of_pic_init’: arch/mips/netlogic/common/irq.c:298:2: error: implicit declaration of function ‘cpu_is_xlp9xx’ [-Werror=implicit-function-declaration] if (cpu_is_xlp9xx()) { ^ Although the code was conditional upon CONFIG_OF which is indirectly selected by CONFIG_NLM_XLP_BOARD but not CONFIG_NLM_XLR_BOARD, the failing XLR with CONFIG_OF configuration can be configured manually or by randconfig. Fix the build failure by making the affected XLP PIC code conditional upon CONFIG_CPU_XLP which is used to guard the inclusion of asm/netlogic/xlp-hal/xlp.h that provides the required cpu_is_xlp9xx function. [ralf@linux-mips.org: Fixed up as per Jayachandran's suggestion.] Signed-off-by: Paul Burton <paul.burton@imgtec.com> Cc: Jayachandran C <jchandra@broadcom.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/14524/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 9a8ef14 commit d2d72c0

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

  • arch/mips/netlogic/common

arch/mips/netlogic/common/irq.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ asmlinkage void plat_irq_dispatch(void)
275275
do_IRQ(nlm_irq_to_xirq(node, i));
276276
}
277277

278-
#ifdef CONFIG_OF
278+
#ifdef CONFIG_CPU_XLP
279279
static const struct irq_domain_ops xlp_pic_irq_domain_ops = {
280280
.xlate = irq_domain_xlate_onetwocell,
281281
};
@@ -348,7 +348,7 @@ void __init arch_init_irq(void)
348348
#if defined(CONFIG_CPU_XLR)
349349
nlm_setup_fmn_irq();
350350
#endif
351-
#if defined(CONFIG_OF)
351+
#ifdef CONFIG_CPU_XLP
352352
of_irq_init(xlp_pic_irq_ids);
353353
#endif
354354
}

0 commit comments

Comments
 (0)