diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 02:11:29 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 02:11:29 +0200 |
| commit | 40193713df2cdb9c233b3fc2029ecdccb40cb1e4 (patch) | |
| tree | db2ce73665b250672f5f5c0cf7544ec370c122f9 /include/asm-ppc64/mmu.h | |
| parent | Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jg... (diff) | |
| parent | [PATCH] Dynamic hugepage addresses for ppc64 (diff) | |
| download | linux-40193713df2cdb9c233b3fc2029ecdccb40cb1e4.tar.xz linux-40193713df2cdb9c233b3fc2029ecdccb40cb1e4.zip | |
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'include/asm-ppc64/mmu.h')
| -rw-r--r-- | include/asm-ppc64/mmu.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/include/asm-ppc64/mmu.h b/include/asm-ppc64/mmu.h index 70348a851313..ad36bb28de29 100644 --- a/include/asm-ppc64/mmu.h +++ b/include/asm-ppc64/mmu.h @@ -28,9 +28,12 @@ #define STE_VSID_SHIFT 12 /* Location of cpu0's segment table */ -#define STAB0_PAGE 0x9 +#define STAB0_PAGE 0x6 #define STAB0_PHYS_ADDR (STAB0_PAGE<<PAGE_SHIFT) -#define STAB0_VIRT_ADDR (KERNELBASE+STAB0_PHYS_ADDR) + +#ifndef __ASSEMBLY__ +extern char initial_stab[]; +#endif /* ! __ASSEMBLY */ /* * SLB @@ -259,8 +262,10 @@ extern void stabs_alloc(void); #define VSID_BITS 36 #define VSID_MODULUS ((1UL<<VSID_BITS)-1) -#define CONTEXT_BITS 20 -#define USER_ESID_BITS 15 +#define CONTEXT_BITS 19 +#define USER_ESID_BITS 16 + +#define USER_VSID_RANGE (1UL << (USER_ESID_BITS + SID_SHIFT)) /* * This macro generates asm code to compute the VSID scramble @@ -302,8 +307,7 @@ typedef unsigned long mm_context_id_t; typedef struct { mm_context_id_t id; #ifdef CONFIG_HUGETLB_PAGE - pgd_t *huge_pgdir; - u16 htlb_segs; /* bitmask */ + u16 low_htlb_areas, high_htlb_areas; #endif } mm_context_t; |