#include <linux/initrd.h>
#include <linux/swap.h>
#include <linux/unistd.h>
-#include <linux/nodemask.h> /* for node_online_map */
#include <asm/pgalloc.h>
#include <asm/tlb.h>
#if PTRS_PER_PMD == 1
pmd = (pmd_t *)__pa(pg_dir);
#else
- pmd = (pmd_t *) pgd_address(*pg_dir);
+ pmd = (pmd_t *) (PAGE_MASK & pgd_val(*pg_dir));
/*
* pmd is physical at this point
pmd = (pmd_t *) __pa(pmd);
}
- __pgd_val_set(*pg_dir, PxD_FLAG_PRESENT | PxD_FLAG_VALID | (unsigned long) pmd);
+ pgd_val(*pg_dir) = _PAGE_TABLE | (unsigned long) pmd;
#endif
/* now change pmd to kernel virtual addresses */
* pg_table is physical at this point
*/
- pg_table = (pte_t *) pmd_address(*pmd);
+ pg_table = (pte_t *) (PAGE_MASK & pmd_val(*pmd));
if (!pg_table)
pg_table = (pte_t *) __pa(get_zeroed_page(GFP_KERNEL));
- __pmd_val_set(*pmd, PxD_FLAG_PRESENT | PxD_FLAG_VALID | (unsigned long) pg_table);
+ pmd_val(*pmd) = _PAGE_TABLE | (unsigned long) pg_table;
/* now change pg_table to kernel virtual addresses */
ZONE_DMA zone. */
zones_size[ZONE_DMA] = pmem_ranges[i].pages;
+ free_area_init_node(i, NODE_DATA(i), zones_size,
+ pmem_ranges[i].start_pfn, 0);
+
#ifdef CONFIG_DISCONTIGMEM
- /* Need to initialize the pfnnid_map before we can initialize
- the zone */
{
int j;
- for (j = (pmem_ranges[i].start_pfn >> PFNNID_SHIFT);
- j <= ((pmem_ranges[i].start_pfn + pmem_ranges[i].pages) >> PFNNID_SHIFT);
+ for (j = (node_start_pfn(i) >> PFNNID_SHIFT);
+ j <= (node_end_pfn(i) >> PFNNID_SHIFT);
j++) {
pfnnid_map[j] = i;
}
}
#endif
-
- free_area_init_node(i, NODE_DATA(i), zones_size,
- pmem_ranges[i].start_pfn, NULL);
}
}