lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'linus' into x86/cleanups

Browse Source
This commit is contained in:
Ingo Molnar
2008-06-16 11:17:50 +02:00
parent bf07dc8649 066519068a
commit 1791a78c0b
933 changed files with 13675 additions and 7303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/mm/init_64.c
View File

@ -207,7 +207,7 @@ void __init cleanup_highmap(void)
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));
@ -507,7 +507,7 @@ early_param("memtest", parse_memtest);
static void __init early_memtest(unsigned long start, unsigned long end)
{
unsigned long t_start, t_size;
u64 t_start, t_size;
unsigned pattern;
if (!memtest_pattern)
@ -526,7 +526,7 @@ static void __init early_memtest(unsigned long start, unsigned long end)
if (t_start + t_size > end)
t_size = end - t_start;
printk(KERN_CONT "\n %016lx - %016lx pattern %d",
printk(KERN_CONT "\n %016llx - %016llx pattern %d",
t_start, t_start + t_size, pattern);
memtest(t_start, t_size, pattern);