diff options
Diffstat (limited to 'include/asm-ppc')
| -rw-r--r-- | include/asm-ppc/mmu.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/include/asm-ppc/mmu.h b/include/asm-ppc/mmu.h index 80ae60481fb7..8915c4c3ecb3 100644 --- a/include/asm-ppc/mmu.h +++ b/include/asm-ppc/mmu.h | |||
| @@ -31,20 +31,11 @@ typedef struct { | |||
| 31 | 31 | ||
| 32 | /* Hardware Page Table Entry */ | 32 | /* Hardware Page Table Entry */ |
| 33 | typedef struct _PTE { | 33 | typedef struct _PTE { |
| 34 | #ifdef CONFIG_PPC64BRIDGE | ||
| 35 | unsigned long long vsid:52; | ||
| 36 | unsigned long api:5; | ||
| 37 | unsigned long :5; | ||
| 38 | unsigned long h:1; | ||
| 39 | unsigned long v:1; | ||
| 40 | unsigned long long rpn:52; | ||
| 41 | #else /* CONFIG_PPC64BRIDGE */ | ||
| 42 | unsigned long v:1; /* Entry is valid */ | 34 | unsigned long v:1; /* Entry is valid */ |
| 43 | unsigned long vsid:24; /* Virtual segment identifier */ | 35 | unsigned long vsid:24; /* Virtual segment identifier */ |
| 44 | unsigned long h:1; /* Hash algorithm indicator */ | 36 | unsigned long h:1; /* Hash algorithm indicator */ |
| 45 | unsigned long api:6; /* Abbreviated page index */ | 37 | unsigned long api:6; /* Abbreviated page index */ |
| 46 | unsigned long rpn:20; /* Real (physical) page number */ | 38 | unsigned long rpn:20; /* Real (physical) page number */ |
| 47 | #endif /* CONFIG_PPC64BRIDGE */ | ||
| 48 | unsigned long :3; /* Unused */ | 39 | unsigned long :3; /* Unused */ |
| 49 | unsigned long r:1; /* Referenced */ | 40 | unsigned long r:1; /* Referenced */ |
| 50 | unsigned long c:1; /* Changed */ | 41 | unsigned long c:1; /* Changed */ |
| @@ -85,11 +76,7 @@ typedef struct _P601_BATU { /* Upper part of BAT for 601 processor */ | |||
| 85 | } P601_BATU; | 76 | } P601_BATU; |
| 86 | 77 | ||
| 87 | typedef struct _BATU { /* Upper part of BAT (all except 601) */ | 78 | typedef struct _BATU { /* Upper part of BAT (all except 601) */ |
| 88 | #ifdef CONFIG_PPC64BRIDGE | ||
| 89 | unsigned long long bepi:47; | ||
| 90 | #else /* CONFIG_PPC64BRIDGE */ | ||
| 91 | unsigned long bepi:15; /* Effective page index (virtual address) */ | 79 | unsigned long bepi:15; /* Effective page index (virtual address) */ |
| 92 | #endif /* CONFIG_PPC64BRIDGE */ | ||
| 93 | unsigned long :4; /* Unused */ | 80 | unsigned long :4; /* Unused */ |
| 94 | unsigned long bl:11; /* Block size mask */ | 81 | unsigned long bl:11; /* Block size mask */ |
| 95 | unsigned long vs:1; /* Supervisor valid */ | 82 | unsigned long vs:1; /* Supervisor valid */ |
| @@ -104,11 +91,7 @@ typedef struct _P601_BATL { /* Lower part of BAT for 601 processor */ | |||
| 104 | } P601_BATL; | 91 | } P601_BATL; |
| 105 | 92 | ||
| 106 | typedef struct _BATL { /* Lower part of BAT (all except 601) */ | 93 | typedef struct _BATL { /* Lower part of BAT (all except 601) */ |
| 107 | #ifdef CONFIG_PPC64BRIDGE | ||
| 108 | unsigned long long brpn:47; | ||
| 109 | #else /* CONFIG_PPC64BRIDGE */ | ||
| 110 | unsigned long brpn:15; /* Real page index (physical address) */ | 94 | unsigned long brpn:15; /* Real page index (physical address) */ |
| 111 | #endif /* CONFIG_PPC64BRIDGE */ | ||
| 112 | unsigned long :10; /* Unused */ | 95 | unsigned long :10; /* Unused */ |
| 113 | unsigned long w:1; /* Write-thru cache */ | 96 | unsigned long w:1; /* Write-thru cache */ |
| 114 | unsigned long i:1; /* Cache inhibit */ | 97 | unsigned long i:1; /* Cache inhibit */ |