diff options
Diffstat (limited to 'arch/sh/kernel/cpu/sh3/entry.S')
-rw-r--r-- | arch/sh/kernel/cpu/sh3/entry.S | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/sh/kernel/cpu/sh3/entry.S b/arch/sh/kernel/cpu/sh3/entry.S index f6a389c996cb..262db6ec067b 100644 --- a/arch/sh/kernel/cpu/sh3/entry.S +++ b/arch/sh/kernel/cpu/sh3/entry.S | |||
@@ -2,7 +2,7 @@ | |||
2 | * arch/sh/kernel/cpu/sh3/entry.S | 2 | * arch/sh/kernel/cpu/sh3/entry.S |
3 | * | 3 | * |
4 | * Copyright (C) 1999, 2000, 2002 Niibe Yutaka | 4 | * Copyright (C) 1999, 2000, 2002 Niibe Yutaka |
5 | * Copyright (C) 2003 - 2006 Paul Mundt | 5 | * Copyright (C) 2003 - 2012 Paul Mundt |
6 | * | 6 | * |
7 | * This file is subject to the terms and conditions of the GNU General Public | 7 | * This file is subject to the terms and conditions of the GNU General Public |
8 | * License. See the file "COPYING" in the main directory of this archive | 8 | * License. See the file "COPYING" in the main directory of this archive |
@@ -17,6 +17,7 @@ | |||
17 | #include <cpu/mmu_context.h> | 17 | #include <cpu/mmu_context.h> |
18 | #include <asm/page.h> | 18 | #include <asm/page.h> |
19 | #include <asm/cache.h> | 19 | #include <asm/cache.h> |
20 | #include <asm/thread_info.h> | ||
20 | 21 | ||
21 | ! NOTE: | 22 | ! NOTE: |
22 | ! GNU as (as of 2.9.1) changes bf/s into bt/s and bra, when the address | 23 | ! GNU as (as of 2.9.1) changes bf/s into bt/s and bra, when the address |
@@ -114,22 +115,22 @@ ENTRY(tlb_miss_load) | |||
114 | .align 2 | 115 | .align 2 |
115 | ENTRY(tlb_miss_store) | 116 | ENTRY(tlb_miss_store) |
116 | bra call_handle_tlbmiss | 117 | bra call_handle_tlbmiss |
117 | mov #1, r5 | 118 | mov #FAULT_CODE_WRITE, r5 |
118 | 119 | ||
119 | .align 2 | 120 | .align 2 |
120 | ENTRY(initial_page_write) | 121 | ENTRY(initial_page_write) |
121 | bra call_handle_tlbmiss | 122 | bra call_handle_tlbmiss |
122 | mov #2, r5 | 123 | mov #FAULT_CODE_INITIAL, r5 |
123 | 124 | ||
124 | .align 2 | 125 | .align 2 |
125 | ENTRY(tlb_protection_violation_load) | 126 | ENTRY(tlb_protection_violation_load) |
126 | bra call_do_page_fault | 127 | bra call_do_page_fault |
127 | mov #0, r5 | 128 | mov #FAULT_CODE_PROT, r5 |
128 | 129 | ||
129 | .align 2 | 130 | .align 2 |
130 | ENTRY(tlb_protection_violation_store) | 131 | ENTRY(tlb_protection_violation_store) |
131 | bra call_do_page_fault | 132 | bra call_do_page_fault |
132 | mov #1, r5 | 133 | mov #(FAULT_CODE_PROT | FAULT_CODE_WRITE), r5 |
133 | 134 | ||
134 | call_handle_tlbmiss: | 135 | call_handle_tlbmiss: |
135 | mov.l 1f, r0 | 136 | mov.l 1f, r0 |