diff options
-rw-r--r-- | include/asm-sh/addrspace.h | 8 | ||||
-rw-r--r-- | include/asm-sh/page.h | 16 |
2 files changed, 8 insertions, 16 deletions
diff --git a/include/asm-sh/addrspace.h b/include/asm-sh/addrspace.h index cb9da9992fa0..e7f2deb28e06 100644 --- a/include/asm-sh/addrspace.h +++ b/include/asm-sh/addrspace.h | |||
@@ -17,6 +17,14 @@ | |||
17 | /* If this CPU supports segmentation, hook up the helpers */ | 17 | /* If this CPU supports segmentation, hook up the helpers */ |
18 | #ifdef P1SEG | 18 | #ifdef P1SEG |
19 | 19 | ||
20 | /* | ||
21 | [ P0/U0 (virtual) ] 0x00000000 <------ User space | ||
22 | [ P1 (fixed) cached ] 0x80000000 <------ Kernel space | ||
23 | [ P2 (fixed) non-cachable] 0xA0000000 <------ Physical access | ||
24 | [ P3 (virtual) cached] 0xC0000000 <------ vmalloced area | ||
25 | [ P4 control ] 0xE0000000 | ||
26 | */ | ||
27 | |||
20 | /* Returns the privileged segment base of a given address */ | 28 | /* Returns the privileged segment base of a given address */ |
21 | #define PXSEG(a) (((unsigned long)(a)) & 0xe0000000) | 29 | #define PXSEG(a) (((unsigned long)(a)) & 0xe0000000) |
22 | 30 | ||
diff --git a/include/asm-sh/page.h b/include/asm-sh/page.h index cdaacefe509b..407bf5a14936 100644 --- a/include/asm-sh/page.h +++ b/include/asm-sh/page.h | |||
@@ -5,14 +5,6 @@ | |||
5 | * Copyright (C) 1999 Niibe Yutaka | 5 | * Copyright (C) 1999 Niibe Yutaka |
6 | */ | 6 | */ |
7 | 7 | ||
8 | /* | ||
9 | [ P0/U0 (virtual) ] 0x00000000 <------ User space | ||
10 | [ P1 (fixed) cached ] 0x80000000 <------ Kernel space | ||
11 | [ P2 (fixed) non-cachable] 0xA0000000 <------ Physical access | ||
12 | [ P3 (virtual) cached] 0xC0000000 <------ vmalloced area | ||
13 | [ P4 control ] 0xE0000000 | ||
14 | */ | ||
15 | |||
16 | #ifdef __KERNEL__ | 8 | #ifdef __KERNEL__ |
17 | 9 | ||
18 | /* PAGE_SHIFT determines the page size */ | 10 | /* PAGE_SHIFT determines the page size */ |
@@ -115,14 +107,6 @@ typedef struct { unsigned long pgd; } pgd_t; | |||
115 | /* to align the pointer to the (next) page boundary */ | 107 | /* to align the pointer to the (next) page boundary */ |
116 | #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) | 108 | #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) |
117 | 109 | ||
118 | /* | ||
119 | * IF YOU CHANGE THIS, PLEASE ALSO CHANGE | ||
120 | * | ||
121 | * arch/sh/kernel/vmlinux.lds.S | ||
122 | * | ||
123 | * which has the same constant encoded.. | ||
124 | */ | ||
125 | |||
126 | #define __MEMORY_START CONFIG_MEMORY_START | 110 | #define __MEMORY_START CONFIG_MEMORY_START |
127 | #define __MEMORY_SIZE CONFIG_MEMORY_SIZE | 111 | #define __MEMORY_SIZE CONFIG_MEMORY_SIZE |
128 | 112 | ||