git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
parisc
/
mm
/
init.c
diff --git
a/arch/parisc/mm/init.c
b/arch/parisc/mm/init.c
index
a2dced5
..
065da58
100644
(file)
--- a/
arch/parisc/mm/init.c
+++ b/
arch/parisc/mm/init.c
@@
-20,7
+20,6
@@
#include <linux/initrd.h>
#include <linux/swap.h>
#include <linux/unistd.h>
#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>
#include <asm/pgalloc.h>
#include <asm/tlb.h>
@@
-751,7
+750,7
@@
map_hpux_gateway_page(struct task_struct *tsk, struct mm_struct *mm)
#if PTRS_PER_PMD == 1
pmd = (pmd_t *)__pa(pg_dir);
#else
#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 is physical at this point
@@
-762,7
+761,7
@@
map_hpux_gateway_page(struct task_struct *tsk, struct mm_struct *mm)
pmd = (pmd_t *) __pa(pmd);
}
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 */
#endif
/* now change pmd to kernel virtual addresses */
@@
-772,11
+771,11
@@
map_hpux_gateway_page(struct task_struct *tsk, struct mm_struct *mm)
* pg_table is physical at this point
*/
* 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));
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 */
/* now change pg_table to kernel virtual addresses */
@@
-805,21
+804,19
@@
void __init paging_init(void)
ZONE_DMA zone. */
zones_size[ZONE_DMA] = pmem_ranges[i].pages;
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
#ifdef CONFIG_DISCONTIGMEM
- /* Need to initialize the pfnnid_map before we can initialize
- the zone */
{
int j;
{
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
j++) {
pfnnid_map[j] = i;
}
}
#endif
-
- free_area_init_node(i, NODE_DATA(i), zones_size,
- pmem_ranges[i].start_pfn, NULL);
}
}
}
}