diff options
author | davem <davem> | 2001-12-05 06:05:35 +0000 |
---|---|---|
committer | davem <davem> | 2001-12-05 06:05:35 +0000 |
commit | 08bdaa4d7967fc17fb9241307407251aecbc37bc (patch) | |
tree | 4a368e8b6d8b5517771ace51f2e8f20875ee11f7 | |
parent | 35c12815a23df751403d388f281d77f6af9f4476 (diff) | |
download | netdev-vger-cvs-08bdaa4d7967fc17fb9241307407251aecbc37bc.tar.gz |
Move kernel/obp/modules/vmalloc area defines into
one place, asm/pgtable.h
-rw-r--r-- | arch/sparc64/lib/blockops.S | 6 | ||||
-rw-r--r-- | arch/sparc64/mm/modutil.c | 13 | ||||
-rw-r--r-- | include/asm-sparc64/pgtable.h | 32 |
3 files changed, 20 insertions, 31 deletions
diff --git a/arch/sparc64/lib/blockops.S b/arch/sparc64/lib/blockops.S index 73798cac6..5903c09a7 100644 --- a/arch/sparc64/lib/blockops.S +++ b/arch/sparc64/lib/blockops.S @@ -1,4 +1,4 @@ -/* $Id: blockops.S,v 1.40 2001-12-05 01:24:54 davem Exp $ +/* $Id: blockops.S,v 1.41 2001-12-05 06:05:35 davem Exp $ * blockops.S: UltraSparc block zero optimized routines. * * Copyright (C) 1996, 1998, 1999, 2000 David S. Miller (davem@redhat.com) @@ -17,10 +17,6 @@ fmovd %reg4, %f56; fmovd %reg5, %f58; \ fmovd %reg6, %f60; fmovd %reg7, %f62; -/* Please read the comment above MODULES_VADDR in arch/sparc64/mm/modutil.c - * before making modifications to TLBTEMP_BASE. - */ -#define TLBTEMP_BASE (16 * 1024 * 1024) #define DCACHE_SIZE (PAGE_SIZE * 2) #define TLBTEMP_ENT1 (60 << 3) #define TLBTEMP_ENT2 (61 << 3) diff --git a/arch/sparc64/mm/modutil.c b/arch/sparc64/mm/modutil.c index a3a80cff5..9ef702594 100644 --- a/arch/sparc64/mm/modutil.c +++ b/arch/sparc64/mm/modutil.c @@ -1,4 +1,4 @@ -/* $Id: modutil.c,v 1.10 2001-12-05 01:24:54 davem Exp $ +/* $Id: modutil.c,v 1.11 2001-12-05 06:05:35 davem Exp $ * arch/sparc64/mm/modutil.c * * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) @@ -11,17 +11,6 @@ #include <asm/uaccess.h> #include <asm/system.h> -/* The kernel image occupies 0x4000000 to 0x1000000 (4MB --> 16MB). - * The page copy blockops use 0x1000000 to 0x18000000 (16MB --> 24MB). - * The PROM resides in an area spanning 0xf0000000 to 0x100000000. - * The vmalloc area spans 0x140000000 to 0x200000000. - * There is a single static kernel PMD which maps from 0x0 to address - * 0x400000000. - */ -#define MODULES_VADDR 0x0000000002000000ULL /* Where to map modules */ -#define MODULES_LEN 0x000000007e000000ULL -#define MODULES_END 0x0000000080000000ULL - static struct vm_struct * modvmlist = NULL; void module_unmap (void * addr) diff --git a/include/asm-sparc64/pgtable.h b/include/asm-sparc64/pgtable.h index 73a798f25..913819d57 100644 --- a/include/asm-sparc64/pgtable.h +++ b/include/asm-sparc64/pgtable.h @@ -1,4 +1,4 @@ -/* $Id: pgtable.h,v 1.153 2001-12-05 01:24:54 davem Exp $ +/* $Id: pgtable.h,v 1.154 2001-12-05 06:05:36 davem Exp $ * pgtable.h: SpitFire page table operations. * * Copyright 1996,1997 David S. Miller (davem@caip.rutgers.edu) @@ -19,6 +19,23 @@ #include <asm/page.h> #include <asm/processor.h> +/* The kernel image occupies 0x4000000 to 0x1000000 (4MB --> 16MB). + * The page copy blockops use 0x1000000 to 0x18000000 (16MB --> 24MB). + * The PROM resides in an area spanning 0xf0000000 to 0x100000000. + * The vmalloc area spans 0x140000000 to 0x200000000. + * There is a single static kernel PMD which maps from 0x0 to address + * 0x400000000. + */ +#define TLBTEMP_BASE 0x0000000001000000 +#define MODULES_VADDR 0x0000000002000000 +#define MODULES_LEN 0x000000007e000000 +#define MODULES_END 0x0000000080000000 +#define VMALLOC_START 0x0000000140000000 +#define VMALLOC_VMADDR(x) ((unsigned long)(x)) +#define VMALLOC_END 0x0000000200000000 +#define LOW_OBP_ADDRESS 0x00000000f0000000 +#define HI_OBP_ADDRESS 0x0000000100000000 + /* XXX All of this needs to be rethought so we can take advantage * XXX cheetah's full 64-bit virtual address space, ie. no more hole * XXX in the middle like on spitfire. -DaveM @@ -77,17 +94,6 @@ (1) : (PTRS_PER_PGD))) #define FIRST_USER_PGD_NR 0 -/* NOTE: TLB miss handlers depend heavily upon where this is. In fact, - * please read the comment above MODULES_VADDR in - * arch/sparc64/mm/modutil.c before making modifications - * to these values. - */ -#define VMALLOC_START 0x0000000140000000UL -#define VMALLOC_VMADDR(x) ((unsigned long)(x)) -#define VMALLOC_END 0x0000000200000000UL -#define LOW_OBP_ADDRESS 0xf0000000UL -#define HI_OBP_ADDRESS 0x100000000UL - #define pte_ERROR(e) __builtin_trap() #define pmd_ERROR(e) __builtin_trap() #define pgd_ERROR(e) __builtin_trap() @@ -294,8 +300,6 @@ extern inline pte_t mk_pte_io(unsigned long page, pgprot_t prot, int space) #define swp_entry_to_pte(x) ((pte_t) { (x).val }) extern unsigned long prom_virt_to_phys(unsigned long, int *); -#define LOW_OBP_ADDRESS 0xf0000000UL -#define HI_OBP_ADDRESS 0x100000000UL extern __inline__ unsigned long sun4u_get_pte (unsigned long addr) |