diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-03 11:31:09 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-03 11:31:09 +0100 |
| commit | 3cecdda3f169f22f324f78fd544beee68e3cc6a4 (patch) | |
| tree | e7c2995ddc2690d1be695a1525bcd16d3965548d /include/asm-sh/entry-macros.S | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spu... (diff) | |
| parent | [POWERPC] Convert the cell IOMMU fixed mapping to 16M IOMMU pages (diff) | |
| download | linux-3cecdda3f169f22f324f78fd544beee68e3cc6a4.tar.xz linux-3cecdda3f169f22f324f78fd544beee68e3cc6a4.zip | |
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell-2.6 into merge
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 @@ not r11, r11 stc sr, r10 and r11, r10 -#ifdef CONFIG_HAS_SR_RB +#ifdef CONFIG_CPU_HAS_SR_RB stc k_g_imask, r11 or r11, r10 #endif @@ -20,7 +20,7 @@ .endm .macro get_current_thread_info, ti, tmp -#ifdef CONFIG_HAS_SR_RB +#ifdef CONFIG_CPU_HAS_SR_RB stc r7_bank, \ti #else mov #((THREAD_SIZE - 1) >> 10) ^ 0xff, \tmp |