tree cdf432886e5e36ca2f45eac7daa09d09ec1c9882
parent 0ab20002f4b41f4b1799bad5948389da1c4c8444
author David Gibson <[EMAIL PROTECTED]> Fri, 19 Aug 2005 14:52:32 +1000
committer Paul Mackerras <[EMAIL PROTECTED]> Mon, 29 Aug 2005 10:53:34 +1000

[PATCH] Fix apparent code overlap in ppc64 head.S

An #if/#else construct near the top of ppc64's head.S appears to
create overlapping sections of code for iSeries and pSeries (i.e. one
thing on iSeries and something different in the same place on
pSeries).  In fact, checking the various absolute offsets, it doesn't.
This patch unravels the #ifdefs to make it more obvious what's going
on.  This accomplishes another microstep towards a single kernel image
which can boot both iSeries and pSeries.

Signed-off-by: David Gibson <[EMAIL PROTECTED]>
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>

 arch/ppc64/kernel/head.S |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S
--- a/arch/ppc64/kernel/head.S
+++ b/arch/ppc64/kernel/head.S
@@ -93,6 +93,7 @@ END_FTR_SECTION(0, 1)
        /* Catch branch to 0 in real mode */
         * At offset 0x20, there is a pointer to iSeries LPAR data.
@@ -119,7 +120,7 @@ embedded_sysmap_start:
        .llong  0
+#endif /* CONFIG_PPC_ISERIES */
        /* Secondary processors spin on this value until it goes to 1. */
        .globl  __secondary_hold_spinloop
@@ -169,7 +170,6 @@ _GLOBAL(__secondary_hold)
 /* This value is used to mark exception frames on the stack. */
        .section ".toc","aw"
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to