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-ppc | |
| parent | a7ce7d5e94c98ef5b867f61b2ebecd563f4b6ec9 (diff) | |
Merge with Linux 2.4.0-test6-pre8.
Diffstat (limited to 'include/asm-ppc')
| -rw-r--r-- | include/asm-ppc/pgtable.h | 5 | ||||
| -rw-r--r-- | include/asm-ppc/processor.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/asm-ppc/pgtable.h b/include/asm-ppc/pgtable.h index 703dc409b..348404828 100644 --- a/include/asm-ppc/pgtable.h +++ b/include/asm-ppc/pgtable.h @@ -274,7 +274,7 @@ extern unsigned long ioremap_bot, ioremap_base; * for zero-mapped memory areas etc.. */ extern unsigned long empty_zero_page[1024]; -#define ZERO_PAGE(vaddr) (mem_map + MAP_NR(empty_zero_page)) +#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page)) /* * BAD_PAGETABLE is used when we need a bogus page-table, while @@ -303,7 +303,6 @@ extern pte_t * __bad_pagetable(void); #define pte_none(pte) (!pte_val(pte)) #define pte_present(pte) (pte_val(pte) & _PAGE_PRESENT) #define pte_clear(ptep) do { pte_val(*(ptep)) = 0; } while (0) -#define pte_pagenr(x) ((unsigned long)((pte_val(x) >> PAGE_SHIFT))) #define pmd_none(pmd) (!pmd_val(pmd)) #define pmd_bad(pmd) ((pmd_val(pmd) & ~PAGE_MASK) != 0) @@ -315,7 +314,7 @@ extern pte_t * __bad_pagetable(void); */ #define page_address(page) ((page)->virtual) #define pages_to_mb(x) ((x) >> (20-PAGE_SHIFT)) -#define pte_page(x) (mem_map+pte_pagenr(x)) +#define pte_page(x) (mem_map+(unsigned long)((pte_val(x) >> PAGE_SHIFT))) #ifndef __ASSEMBLY__ /* diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index a0a96d937..4fd684705 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -687,7 +687,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) /* in process.c - for early bootup debug -- Cort */ int ll_printk(const char *, ...); |