summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbcollins <tailor@grayson>2006-06-01 13:19:22 -0400
committerBen Collins <bcollins@ubuntu.com>2006-06-01 13:19:22 -0400
commit9d33287fdd06089c8895d9bbb9cac348181c3a6b (patch)
treeac6ecaf71be8a14106cc409822142a1e80d64096
parent0af24d4affd43444f77be95d8bfa7913d965b7f2 (diff)
downloadsilo-9d33287fdd06089c8895d9bbb9cac348181c3a6b.tar.gz
[silo @ 128]
Fix setting of kernel_params for sparc32.#
-rw-r--r--second/main.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/second/main.c b/second/main.c
index 8d34caa..959c4cd 100644
--- a/second/main.c
+++ b/second/main.c
@@ -1290,8 +1290,11 @@ try_again:
}
if (*(unsigned short *)(p + 8) >= 0x202) {
- kernel_params = (char *)((*(unsigned int *)(p + 36) - 0x400000) +
+ if (architecture == sun4u)
+ kernel_params = (char *)((*(unsigned int *)(p + 36) - 0x400000) +
(image_base - 0x4000));
+ else
+ kernel_params = (char *)(*(unsigned int *)(p + 36) & 0x3fffff);
}
/* Some UltraAX machines have /dev/fd1 floppies only. */