diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-12-30 05:19:31 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-12-30 05:19:31 +0100 |
| commit | dece8ada993e1764a115bdff0f1effffaa5fc8dc (patch) | |
| tree | ba35b26bce046c3062bf13b2fd7611cf9265e66e /arch/powerpc/kernel/misc_64.S | |
| parent | powerpc: Fix endian issues in power7/8 machine check handler (diff) | |
| parent | Merge remote-tracking branch 'agust/merge' into merge (diff) | |
| download | linux-dece8ada993e1764a115bdff0f1effffaa5fc8dc.tar.xz linux-dece8ada993e1764a115bdff0f1effffaa5fc8dc.zip | |
Merge branch 'merge' into next
Merge a pile of fixes that went into the "merge" branch (3.13-rc's) such
as Anton Little Endian fixes.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/misc_64.S')
| -rw-r--r-- | arch/powerpc/kernel/misc_64.S | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S index a9f7a79a3a40..3d0249599d52 100644 --- a/arch/powerpc/kernel/misc_64.S +++ b/arch/powerpc/kernel/misc_64.S @@ -252,8 +252,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 @@ -283,6 +283,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 |