diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 06:33:44 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 06:33:44 +0000 |
| commit | 6bd6dbbd3ae53a268a510270bebaab24fff382ca (patch) | |
| tree | 41d0361e6b48ce74584c9a6fcb475d5054ca4141 /include/asm-sparc64 | |
| parent | ee355114ec6062d00c1376b184b886a39e74fd4e (diff) | |
Merge with Linux 2.4.0-test6-pre10.
Diffstat (limited to 'include/asm-sparc64')
| -rw-r--r-- | include/asm-sparc64/mmu_context.h | 8 | ||||
| -rw-r--r-- | include/asm-sparc64/page.h | 3 | ||||
| -rw-r--r-- | include/asm-sparc64/pgtable.h | 5 | ||||
| -rw-r--r-- | include/asm-sparc64/processor.h | 2 |
4 files changed, 7 insertions, 11 deletions
diff --git a/include/asm-sparc64/mmu_context.h b/include/asm-sparc64/mmu_context.h index d6ef977d9..ea7b83d5b 100644 --- a/include/asm-sparc64/mmu_context.h +++ b/include/asm-sparc64/mmu_context.h @@ -1,4 +1,4 @@ -/* $Id: mmu_context.h,v 1.42 2000/02/08 07:47:03 davem Exp $ */ +/* $Id: mmu_context.h,v 1.43 2000/08/09 08:04:45 davem Exp $ */ #ifndef __SPARC64_MMU_CONTEXT_H #define __SPARC64_MMU_CONTEXT_H @@ -29,11 +29,9 @@ extern void get_new_mmu_context(struct mm_struct *mm); /* Initialize a new mmu context. This is invoked when a new * address space instance (unique or shared) is instantiated. - * A fresh mm_struct is cleared out to zeros, so this need not - * do anything on Sparc64 since the only thing we care about - * is that mm->context is an invalid context (ie. zero). + * This just needs to set mm->context to an invalid context. */ -#define init_new_context(__tsk, __mm) do { } while(0) +#define init_new_context(__tsk, __mm) ((__mm)->context = 0UL) /* Destroy a dead context. This occurs when mmput drops the * mm_users count to zero, the mmaps have been released, and diff --git a/include/asm-sparc64/page.h b/include/asm-sparc64/page.h index 79f4d7448..86bd26402 100644 --- a/include/asm-sparc64/page.h +++ b/include/asm-sparc64/page.h @@ -105,7 +105,8 @@ register unsigned long PAGE_OFFSET asm("g4"); #define __pa(x) ((unsigned long)(x) - PAGE_OFFSET) #define __va(x) ((void *)((unsigned long) (x) + PAGE_OFFSET)) -#define MAP_NR(addr) ((__pa(addr)-phys_base) >> PAGE_SHIFT) +#define virt_to_page(kaddr) (mem_map + ((__pa(kaddr)-phys_base) >> PAGE_SHIFT)) +#define VALID_PAGE(page) ((page - mem_map) < max_mapnr) #define virt_to_phys __pa #define phys_to_virt __va diff --git a/include/asm-sparc64/pgtable.h b/include/asm-sparc64/pgtable.h index 3318578f3..c47527736 100644 --- a/include/asm-sparc64/pgtable.h +++ b/include/asm-sparc64/pgtable.h @@ -1,4 +1,4 @@ -/* $Id: pgtable.h,v 1.128 2000/08/05 13:30:34 davem Exp $ +/* $Id: pgtable.h,v 1.130 2000/08/09 00:00:17 davem Exp $ * pgtable.h: SpitFire page table operations. * * Copyright 1996,1997 David S. Miller (davem@caip.rutgers.edu) @@ -57,9 +57,6 @@ #define PMD_TABLE_SIZE 0x2000 /* 2048 entries 4 bytes each */ #define PGD_TABLE_SIZE 0x1000 /* 1024 entries 4 bytes each */ -/* the no. of pointers that fit on a page */ -#define PTRS_PER_PAGE (1UL << (PAGE_SHIFT-3)) - /* NOTE: TLB miss handlers depend heavily upon where this is. */ #define VMALLOC_START 0x0000000140000000UL #define VMALLOC_VMADDR(x) ((unsigned long)(x)) diff --git a/include/asm-sparc64/processor.h b/include/asm-sparc64/processor.h index 37433eace..eae8b7bdb 100644 --- a/include/asm-sparc64/processor.h +++ b/include/asm-sparc64/processor.h @@ -1,4 +1,4 @@ -/* $Id: processor.h,v 1.64 2000/05/09 17:40:15 davem Exp $ +/* $Id: processor.h,v 1.65 2000/08/09 00:00:17 davem Exp $ * include/asm-sparc64/processor.h * * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |