diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 22:17:26 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 22:17:26 +0000 |
| commit | 984760dbf5e48f6224dfe9e26e03536b3d38b6cd (patch) | |
| tree | a99674322e524c4c90009b3bdae5fab0eebf2094 /include/asm-alpha | |
| parent | a7ce7d5e94c98ef5b867f61b2ebecd563f4b6ec9 (diff) | |
Merge with Linux 2.4.0-test6-pre8.
Diffstat (limited to 'include/asm-alpha')
| -rw-r--r-- | include/asm-alpha/pgalloc.h | 2 | ||||
| -rw-r--r-- | include/asm-alpha/pgtable.h | 5 | ||||
| -rw-r--r-- | include/asm-alpha/processor.h | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/include/asm-alpha/pgalloc.h b/include/asm-alpha/pgalloc.h index 45e5b3b59..dc23ef74d 100644 --- a/include/asm-alpha/pgalloc.h +++ b/include/asm-alpha/pgalloc.h @@ -245,7 +245,7 @@ extern __inline__ pgd_t *get_pgd_slow(void) (PTRS_PER_PGD - USER_PTRS_PER_PGD) * sizeof(pgd_t)); pgd_val(ret[PTRS_PER_PGD]) - = pte_val(mk_pte(mem_map + MAP_NR(ret), PAGE_KERNEL)); + = pte_val(mk_pte(virt_to_page(ret), PAGE_KERNEL)); } return ret; } diff --git a/include/asm-alpha/pgtable.h b/include/asm-alpha/pgtable.h index 2614e8189..d68e18332 100644 --- a/include/asm-alpha/pgtable.h +++ b/include/asm-alpha/pgtable.h @@ -141,7 +141,7 @@ extern unsigned long __zero_page(void); #define BAD_PAGETABLE __bad_pagetable() #define BAD_PAGE __bad_page() -#define ZERO_PAGE(vaddr) (mem_map + MAP_NR(ZERO_PGE)) +#define ZERO_PAGE(vaddr) (virt_to_page(ZERO_PGE)) /* number of bits that fit into a memory pointer */ #define BITS_PER_PTR (8*sizeof(unsigned long)) @@ -209,8 +209,7 @@ extern inline void pmd_set(pmd_t * pmdp, pte_t * ptep) extern inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp) { pgd_val(*pgdp) = _PAGE_TABLE | ((((unsigned long) pmdp) - PAGE_OFFSET) << (32-PAGE_SHIFT)); } -#define pte_pagenr(x) ((unsigned long)((pte_val(x) >> 32))) -#define pte_page(x) (mem_map+pte_pagenr(x)) +#define pte_page(x) (mem_map+(unsigned long)((pte_val(x) >> 32))) extern inline unsigned long pmd_page(pmd_t pmd) { return PAGE_OFFSET + ((pmd_val(pmd) & _PFN_MASK) >> (32-PAGE_SHIFT)); } diff --git a/include/asm-alpha/processor.h b/include/asm-alpha/processor.h index 6992e1445..81427025c 100644 --- a/include/asm-alpha/processor.h +++ b/include/asm-alpha/processor.h @@ -145,7 +145,7 @@ unsigned long get_wchan(struct task_struct *p); #define alloc_task_struct() \ ((struct task_struct *) __get_free_pages(GFP_KERNEL,1)) #define free_task_struct(p) free_pages((unsigned long)(p),1) -#define get_task_struct(tsk) atomic_inc(&mem_map[MAP_NR(tsk)].count) +#define get_task_struct(tsk) atomic_inc(&virt_to_page(tsk)->count) #define init_task (init_task_union.task) #define init_stack (init_task_union.stack) |