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-m68k | |
| parent | a7ce7d5e94c98ef5b867f61b2ebecd563f4b6ec9 (diff) | |
Merge with Linux 2.4.0-test6-pre8.
Diffstat (limited to 'include/asm-m68k')
| -rw-r--r-- | include/asm-m68k/pgtable.h | 5 | ||||
| -rw-r--r-- | include/asm-m68k/processor.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/asm-m68k/pgtable.h b/include/asm-m68k/pgtable.h index 3755cb2f4..bedaecc4e 100644 --- a/include/asm-m68k/pgtable.h +++ b/include/asm-m68k/pgtable.h @@ -172,7 +172,7 @@ extern pte_t * __bad_pagetable(void); #define BAD_PAGETABLE __bad_pagetable() #define BAD_PAGE __bad_page() -#define ZERO_PAGE(vaddr) (mem_map + MAP_NR(empty_zero_page)) +#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page)) /* number of bits that fit into a memory pointer */ #define BITS_PER_PTR (8*sizeof(unsigned long)) @@ -228,7 +228,6 @@ extern inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp) #define pte_none(pte) (!pte_val(pte)) #define pte_present(pte) (pte_val(pte) & (_PAGE_PRESENT | _PAGE_FAKE_SUPER)) #define pte_clear(ptep) ({ pte_val(*(ptep)) = 0; }) -#define pte_pagenr(pte) ((__pte_page(pte) - PAGE_OFFSET) >> PAGE_SHIFT) #define pmd_none(pmd) (!pmd_val(pmd)) #define pmd_bad(pmd) ((pmd_val(pmd) & _DESCTYPE_MASK) != _PAGE_TABLE) @@ -248,7 +247,7 @@ extern inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp) /* Permanent address of a page. */ #define page_address(page) ((page)->virtual) #define __page_address(page) (PAGE_OFFSET + (((page) - mem_map) << PAGE_SHIFT)) -#define pte_page(pte) (mem_map+pte_pagenr(pte)) +#define pte_page(pte) (mem_map+((__pte_page(pte) - PAGE_OFFSET) >> PAGE_SHIFT)) #define pte_ERROR(e) \ printk("%s:%d: bad pte %p(%08lx).\n", __FILE__, __LINE__, &(e), pte_val(e)) diff --git a/include/asm-m68k/processor.h b/include/asm-m68k/processor.h index 4444e4f43..79d81adc2 100644 --- a/include/asm-m68k/processor.h +++ b/include/asm-m68k/processor.h @@ -141,7 +141,7 @@ unsigned long get_wchan(struct task_struct *p); ({ \ unsigned long eip = 0; \ if ((tsk)->thread.esp0 > PAGE_SIZE && \ - MAP_NR((tsk)->thread.esp0) < max_mapnr) \ + (VALID_PAGE(virt_to_page((tsk)->thread.esp0)))) \ eip = ((struct pt_regs *) (tsk)->thread.esp0)->pc; \ eip; }) #define KSTK_ESP(tsk) ((tsk) == current ? rdusp() : (tsk)->thread.usp) @@ -152,7 +152,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) |