diff options
Diffstat (limited to 'arch/sparc64/kernel/setup.c')
| -rw-r--r-- | arch/sparc64/kernel/setup.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c index c1f34237cdf2..bf1849dd9c49 100644 --- a/arch/sparc64/kernel/setup.c +++ b/arch/sparc64/kernel/setup.c | |||
| @@ -154,6 +154,7 @@ int prom_callback(long *args) | |||
| 154 | pud_t *pudp; | 154 | pud_t *pudp; |
| 155 | pmd_t *pmdp; | 155 | pmd_t *pmdp; |
| 156 | pte_t *ptep; | 156 | pte_t *ptep; |
| 157 | pte_t pte; | ||
| 157 | 158 | ||
| 158 | for_each_process(p) { | 159 | for_each_process(p) { |
| 159 | mm = p->mm; | 160 | mm = p->mm; |
| @@ -178,8 +179,9 @@ int prom_callback(long *args) | |||
| 178 | * being called from inside OBP. | 179 | * being called from inside OBP. |
| 179 | */ | 180 | */ |
| 180 | ptep = pte_offset_map(pmdp, va); | 181 | ptep = pte_offset_map(pmdp, va); |
| 181 | if (pte_present(*ptep)) { | 182 | pte = *ptep; |
| 182 | tte = pte_val(*ptep); | 183 | if (pte_present(pte)) { |
| 184 | tte = pte_val(pte); | ||
| 183 | res = PROM_TRUE; | 185 | res = PROM_TRUE; |
| 184 | } | 186 | } |
| 185 | pte_unmap(ptep); | 187 | pte_unmap(ptep); |
| @@ -218,6 +220,7 @@ int prom_callback(long *args) | |||
| 218 | pud_t *pudp; | 220 | pud_t *pudp; |
| 219 | pmd_t *pmdp; | 221 | pmd_t *pmdp; |
| 220 | pte_t *ptep; | 222 | pte_t *ptep; |
| 223 | pte_t pte; | ||
| 221 | int error; | 224 | int error; |
| 222 | 225 | ||
| 223 | if ((va >= LOW_OBP_ADDRESS) && (va < HI_OBP_ADDRESS)) { | 226 | if ((va >= LOW_OBP_ADDRESS) && (va < HI_OBP_ADDRESS)) { |
| @@ -240,8 +243,9 @@ int prom_callback(long *args) | |||
| 240 | * being called from inside OBP. | 243 | * being called from inside OBP. |
| 241 | */ | 244 | */ |
| 242 | ptep = pte_offset_kernel(pmdp, va); | 245 | ptep = pte_offset_kernel(pmdp, va); |
| 243 | if (pte_present(*ptep)) { | 246 | pte = *ptep; |
| 244 | tte = pte_val(*ptep); | 247 | if (pte_present(pte)) { |
| 248 | tte = pte_val(pte); | ||
| 245 | res = PROM_TRUE; | 249 | res = PROM_TRUE; |
| 246 | } | 250 | } |
| 247 | goto done; | 251 | goto done; |
