diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
| commit | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (patch) | |
| tree | 9a82f4b7f2c3afe4b0208d8e44ea61bae90a7d22 /include/asm-sh/entry-macros.S | |
| parent | 5e226e4d9016daee170699f8a4188a5505021756 (diff) | |
| parent | bde4f8fa8db2abd5ac9c542d76012d0fedab050f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-sh/entry-macros.S')
| -rw-r--r-- | include/asm-sh/entry-macros.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sh/entry-macros.S b/include/asm-sh/entry-macros.S index 500030eae7aa..2dab0b8d9454 100644 --- a/include/asm-sh/entry-macros.S +++ b/include/asm-sh/entry-macros.S | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | not r11, r11 | 12 | not r11, r11 |
| 13 | stc sr, r10 | 13 | stc sr, r10 |
| 14 | and r11, r10 | 14 | and r11, r10 |
| 15 | #ifdef CONFIG_HAS_SR_RB | 15 | #ifdef CONFIG_CPU_HAS_SR_RB |
| 16 | stc k_g_imask, r11 | 16 | stc k_g_imask, r11 |
| 17 | or r11, r10 | 17 | or r11, r10 |
| 18 | #endif | 18 | #endif |
| @@ -20,7 +20,7 @@ | |||
| 20 | .endm | 20 | .endm |
| 21 | 21 | ||
| 22 | .macro get_current_thread_info, ti, tmp | 22 | .macro get_current_thread_info, ti, tmp |
| 23 | #ifdef CONFIG_HAS_SR_RB | 23 | #ifdef CONFIG_CPU_HAS_SR_RB |
| 24 | stc r7_bank, \ti | 24 | stc r7_bank, \ti |
| 25 | #else | 25 | #else |
| 26 | mov #((THREAD_SIZE - 1) >> 10) ^ 0xff, \tmp | 26 | mov #((THREAD_SIZE - 1) >> 10) ^ 0xff, \tmp |