Skip to contentSkip to conversation

voyager: fix breakage caused by boot_params problem

PATCH In review James Bottomley 3 participants 4 messages Oct 26, 2007 – Oct 27, 2007

lore
Share & tools
lore

James Bottomley

author
#0 lore raw

PATCH 1/1 voyager: fix breakage caused by boot_params problem

There was a missed conversion in the voyager architecture setup file which this corrects.

Signed-off-by James Bottomley <[email protected]>

---

James

include/asm-x86/mach-voyager/setup_arch.h +1 -1
index 84d01ad..10debd2 100644
@@ -1,5 +1,5 @@
 #include <asm/voyager.h>
-#define VOYAGER_BIOS_INFO ((struct voyager_bios_info *)(PARAM+0x40))
+#define VOYAGER_BIOS_INFO ((struct voyager_bios_info *)(&boot_params.apm_bios_info))
 
 /* Hook to call BIOS initialisation function */
Acked-by on v1 1/1
#1 lore raw
Quoted 14 lines · James Bottomley

There was a missed conversion in the voyager architecture setup file which this corrects.

Signed-off-by James Bottomley <[email protected]>

---

James

include/asm-x86/mach-voyager/setup_arch.h +0 -0
index 84d01ad..10debd2 100644

include/asm-x86/mach-voyager/setup_arch.h line 5

Quoted 6 lines
include/asm-x86/mach-voyager/setup_arch.h +1 -1
@@ -1,5 +1,5 @@
 #include <asm/voyager.h>
-#define VOYAGER_BIOS_INFO ((struct voyager_bios_info *)(PARAM+0x40))
+#define VOYAGER_BIOS_INFO ((struct voyager_bios_info *)(&boot_params.apm_bios_info))
 
 /* Hook to call BIOS initialisation function */
Acked-by H. Peter Anvin <[email protected]>
#2 lore raw
In reply to James Bottomley
Quoted 4 lines · On Fri, 26 Oct 2007 12:30:28 -0500 James Bottomley wrote:

There was a missed conversion in the voyager architecture setup file which this corrects.

Signed-off-by James Bottomley <[email protected]>

Oh.
http://lkml.org/lkml/2007/10/22/180
even cc-ed to you.

Quoted 9 lines

---

James

include/asm-x86/mach-voyager/setup_arch.h +0 -0
index 84d01ad..10debd2 100644

include/asm-x86/mach-voyager/setup_arch.h line 4

Quoted 5 lines
include/asm-x86/mach-voyager/setup_arch.h +1 -1
@@ -1,5 +1,5 @@
 #include <asm/voyager.h>
-#define VOYAGER_BIOS_INFO ((struct voyager_bios_info *)(PARAM+0x40))
+#define VOYAGER_BIOS_INFO ((struct voyager_bios_info *)(&boot_params.apm_bios_info))
 
 /* Hook to call BIOS initialisation function */

---
~Randy

author
#3 lore raw
Quoted 10 lines · Randy Dunlap
Quoted 4 lines · On Fri, 26 Oct 2007 12:30:28 -0500 James Bottomley wrote:

There was a missed conversion in the voyager architecture setup file which this corrects.

Signed-off-by James Bottomley <[email protected]>

Oh.
http://lkml.org/lkml/2007/10/22/180
even cc-ed to you.

Gosh, sorry about that.

I actually marked it to be added too. Unfortunately, my usual MO is to get voyager working with the first -rc and then see what the other updates were ... in this case, I duplicated what you'd already done.

James