Skip to content

Commit

Permalink
powerpc: Fix build break with PPC_EARLY_DEBUG_BOOTX=y
Browse files Browse the repository at this point in the history
A kernel configured with PPC_EARLY_DEBUG_BOOTX=y but PPC_PMAC=n and
PPC_MAPLE=n will fail to link:

  btext.c:(.text+0x2d0fc): undefined reference to `.rmci_off'
  btext.c:(.text+0x2d214): undefined reference to `.rmci_on'

Fix it by making the build of rmci_on/off() depend on
PPC_EARLY_DEBUG_BOOTX, which also enable the only code that uses them.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Michael Ellerman authored and Benjamin Herrenschmidt committed Dec 10, 2013
1 parent e80ba46 commit 2d6f0c3
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion arch/powerpc/kernel/misc_64.S
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,8 @@ _GLOBAL(__bswapdi2)
or r3,r7,r9
blr

#if defined(CONFIG_PPC_PMAC) || defined(CONFIG_PPC_MAPLE)

#ifdef CONFIG_PPC_EARLY_DEBUG_BOOTX
_GLOBAL(rmci_on)
sync
isync
Expand Down Expand Up @@ -277,6 +277,9 @@ _GLOBAL(rmci_off)
isync
sync
blr
#endif /* CONFIG_PPC_EARLY_DEBUG_BOOTX */

#if defined(CONFIG_PPC_PMAC) || defined(CONFIG_PPC_MAPLE)

/*
* Do an IO access in real mode
Expand Down

0 comments on commit 2d6f0c3

Please sign in to comment.