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://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
[pandora-kernel.git]
/
arch
/
x86
/
boot
/
memory.c
diff --git
a/arch/x86/boot/memory.c
b/arch/x86/boot/memory.c
index
cae3feb
..
db75d07
100644
(file)
--- a/
arch/x86/boot/memory.c
+++ b/
arch/x86/boot/memory.c
@@
-91,7
+91,7
@@
static int detect_memory_e801(void)
if (oreg.ax > 15*1024) {
return -1; /* Bogus! */
} else if (oreg.ax == 15*1024) {
if (oreg.ax > 15*1024) {
return -1; /* Bogus! */
} else if (oreg.ax == 15*1024) {
- boot_params.alt_mem_k = (oreg.
d
x << 6) + oreg.ax;
+ boot_params.alt_mem_k = (oreg.
b
x << 6) + oreg.ax;
} else {
/*
* This ignores memory above 16MB if we have a memory
} else {
/*
* This ignores memory above 16MB if we have a memory