git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
summit_32.c
diff --git
a/arch/x86/kernel/summit_32.c
b/arch/x86/kernel/summit_32.c
index
6878a9c
..
ae75109
100644
(file)
--- a/
arch/x86/kernel/summit_32.c
+++ b/
arch/x86/kernel/summit_32.c
@@
-29,6
+29,7
@@
#include <linux/mm.h>
#include <linux/init.h>
#include <asm/io.h>
#include <linux/mm.h>
#include <linux/init.h>
#include <asm/io.h>
+#include <asm/bios_ebda.h>
#include <asm/mach-summit/mach_mpparse.h>
static struct rio_table_hdr *rio_table_hdr __initdata;
#include <asm/mach-summit/mach_mpparse.h>
static struct rio_table_hdr *rio_table_hdr __initdata;
@@
-140,8
+141,8
@@
void __init setup_summit(void)
int i, next_wpeg, next_bus = 0;
/* The pointer to the EBDA is stored in the word @ phys 0x40E(40:0E) */
int i, next_wpeg, next_bus = 0;
/* The pointer to the EBDA is stored in the word @ phys 0x40E(40:0E) */
- ptr =
*(unsigned short *)phys_to_virt(0x40Eul
);
- ptr = (unsigned long)phys_to_virt(ptr
<< 4
);
+ ptr =
get_bios_ebda(
);
+ ptr = (unsigned long)phys_to_virt(ptr);
rio_table_hdr = NULL;
offset = 0x180;
rio_table_hdr = NULL;
offset = 0x180;