diff options
Diffstat (limited to 'arch/sh/kernel/cpu/sh3/entry.S')
-rw-r--r-- | arch/sh/kernel/cpu/sh3/entry.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sh/kernel/cpu/sh3/entry.S b/arch/sh/kernel/cpu/sh3/entry.S index 5de99b49873..7ba3dcbe750 100644 --- a/arch/sh/kernel/cpu/sh3/entry.S +++ b/arch/sh/kernel/cpu/sh3/entry.S | |||
@@ -335,7 +335,7 @@ general_exception: | |||
335 | /* This code makes some assumptions to improve performance. | 335 | /* This code makes some assumptions to improve performance. |
336 | * Make sure they are stil true. */ | 336 | * Make sure they are stil true. */ |
337 | #if PTRS_PER_PGD != PTRS_PER_PTE | 337 | #if PTRS_PER_PGD != PTRS_PER_PTE |
338 | #error PDG and PTE sizes don't match | 338 | #error PGD and PTE sizes don't match |
339 | #endif | 339 | #endif |
340 | 340 | ||
341 | /* gas doesn't flag impossible values for mov #immediate as an error */ | 341 | /* gas doesn't flag impossible values for mov #immediate as an error */ |
@@ -547,8 +547,9 @@ ENTRY(handle_exception) | |||
547 | bt/s 1f ! It's a kernel to kernel transition. | 547 | bt/s 1f ! It's a kernel to kernel transition. |
548 | mov r15, k0 ! save original stack to k0 | 548 | mov r15, k0 ! save original stack to k0 |
549 | /* User space to kernel */ | 549 | /* User space to kernel */ |
550 | mov #(THREAD_SIZE >> 8), k1 | 550 | mov #(THREAD_SIZE >> 10), k1 |
551 | shll8 k1 ! k1 := THREAD_SIZE | 551 | shll8 k1 ! k1 := THREAD_SIZE |
552 | shll2 k1 | ||
552 | add current, k1 | 553 | add current, k1 |
553 | mov k1, r15 ! change to kernel stack | 554 | mov k1, r15 ! change to kernel stack |
554 | ! | 555 | ! |