diff options
Diffstat (limited to 'arch/sh/kernel/head_32.S')
-rw-r--r-- | arch/sh/kernel/head_32.S | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/sh/kernel/head_32.S b/arch/sh/kernel/head_32.S index fe0b743881b..6e35f012cc0 100644 --- a/arch/sh/kernel/head_32.S +++ b/arch/sh/kernel/head_32.S | |||
@@ -131,6 +131,7 @@ ENTRY(_stext) | |||
131 | * r8 = scratch register | 131 | * r8 = scratch register |
132 | * r9 = scratch register | 132 | * r9 = scratch register |
133 | * r10 = number of PMB entries we've setup | 133 | * r10 = number of PMB entries we've setup |
134 | * r11 = scratch register | ||
134 | */ | 135 | */ |
135 | 136 | ||
136 | mov.l .LMMUCR, r1 /* Flush the TLB */ | 137 | mov.l .LMMUCR, r1 /* Flush the TLB */ |
@@ -167,8 +168,9 @@ ENTRY(_stext) | |||
167 | 168 | ||
168 | .Lvalidate_existing_mappings: | 169 | .Lvalidate_existing_mappings: |
169 | 170 | ||
171 | mov.l .LPMB_DATA_MASK, r11 | ||
170 | mov.l @r7, r8 | 172 | mov.l @r7, r8 |
171 | and r0, r8 | 173 | and r11, r8 |
172 | cmp/eq r0, r8 /* Check for valid __MEMORY_START mappings */ | 174 | cmp/eq r0, r8 /* Check for valid __MEMORY_START mappings */ |
173 | bt .Lpmb_done | 175 | bt .Lpmb_done |
174 | 176 | ||
@@ -335,12 +337,13 @@ ENTRY(stack_start) | |||
335 | 3: .long __bss_start | 337 | 3: .long __bss_start |
336 | 4: .long _end | 338 | 4: .long _end |
337 | 5: .long start_kernel | 339 | 5: .long start_kernel |
338 | 6: .long sh_cpu_init | 340 | 6: .long cpu_init |
339 | 7: .long init_thread_union | 341 | 7: .long init_thread_union |
340 | 342 | ||
341 | #ifdef CONFIG_PMB | 343 | #ifdef CONFIG_PMB |
342 | .LPMB_ADDR: .long PMB_ADDR | 344 | .LPMB_ADDR: .long PMB_ADDR |
343 | .LPMB_DATA: .long PMB_DATA | 345 | .LPMB_DATA: .long PMB_DATA |
346 | .LPMB_DATA_MASK: .long PMB_PFN_MASK | PMB_V | ||
344 | .LFIRST_ADDR_ENTRY: .long PAGE_OFFSET | PMB_V | 347 | .LFIRST_ADDR_ENTRY: .long PAGE_OFFSET | PMB_V |
345 | .LFIRST_DATA_ENTRY: .long __MEMORY_START | PMB_V | 348 | .LFIRST_DATA_ENTRY: .long __MEMORY_START | PMB_V |
346 | .LMMUCR: .long MMUCR | 349 | .LMMUCR: .long MMUCR |