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 master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[pandora-kernel.git]
/
arch
/
x86_64
/
kernel
/
e820.c
diff --git
a/arch/x86_64/kernel/e820.c
b/arch/x86_64/kernel/e820.c
index
9e94d83
..
d6d7f73
100644
(file)
--- a/
arch/x86_64/kernel/e820.c
+++ b/
arch/x86_64/kernel/e820.c
@@
-8,7
+8,6
@@
* Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
*
*/
* Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
*
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/init.h>
@@
-18,6
+17,7
@@
#include <linux/kexec.h>
#include <linux/module.h>
#include <linux/kexec.h>
#include <linux/module.h>
+#include <asm/pgtable.h>
#include <asm/page.h>
#include <asm/e820.h>
#include <asm/proto.h>
#include <asm/page.h>
#include <asm/e820.h>
#include <asm/proto.h>
@@
-71,7
+71,11
@@
static inline int bad_addr(unsigned long *addrp, unsigned long size)
#endif
/* kernel code + 640k memory hole (later should not be needed, but
be paranoid for now) */
#endif
/* kernel code + 640k memory hole (later should not be needed, but
be paranoid for now) */
- if (last >= 640*1024 && addr < __pa_symbol(&_end)) {
+ if (last >= 640*1024 && addr < 1024*1024) {
+ *addrp = 1024*1024;
+ return 1;
+ }
+ if (last >= __pa_symbol(&_text) && last < __pa_symbol(&_end)) {
*addrp = __pa_symbol(&_end);
return 1;
}
*addrp = __pa_symbol(&_end);
return 1;
}