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
x86: fix pointer type warning in arch/x86/mm/init_64.c:early_memtest
[pandora-kernel.git]
/
arch
/
x86
/
mm
/
init_64.c
diff --git
a/arch/x86/mm/init_64.c
b/arch/x86/mm/init_64.c
index
32ba13b
..
156e6d7
100644
(file)
--- a/
arch/x86/mm/init_64.c
+++ b/
arch/x86/mm/init_64.c
@@
-206,7
+206,7
@@
void __init cleanup_highmap(void)
pmd_t *last_pmd = pmd + PTRS_PER_PMD;
for (; pmd < last_pmd; pmd++, vaddr += PMD_SIZE) {
pmd_t *last_pmd = pmd + PTRS_PER_PMD;
for (; pmd < last_pmd; pmd++, vaddr += PMD_SIZE) {
- if (
!pmd_present
(*pmd))
+ if (
pmd_none
(*pmd))
continue;
if (vaddr < (unsigned long) _text || vaddr > end)
set_pmd(pmd, __pmd(0));
continue;
if (vaddr < (unsigned long) _text || vaddr > end)
set_pmd(pmd, __pmd(0));
@@
-506,7
+506,7
@@
early_param("memtest", parse_memtest);
static void __init early_memtest(unsigned long start, unsigned long end)
{
static void __init early_memtest(unsigned long start, unsigned long end)
{
- u
nsigned long
t_start, t_size;
+ u
64
t_start, t_size;
unsigned pattern;
if (!memtest_pattern)
unsigned pattern;
if (!memtest_pattern)
@@
-525,7
+525,7
@@
static void __init early_memtest(unsigned long start, unsigned long end)
if (t_start + t_size > end)
t_size = end - t_start;
if (t_start + t_size > end)
t_size = end - t_start;
- printk(KERN_CONT "\n %016l
x - %016
lx pattern %d",
+ printk(KERN_CONT "\n %016l
lx - %016l
lx pattern %d",
t_start, t_start + t_size, pattern);
memtest(t_start, t_size, pattern);
t_start, t_start + t_size, pattern);
memtest(t_start, t_size, pattern);