diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-01 14:45:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-01 14:45:48 -0400 |
| commit | 10027471a305c5491d23add394041120720e8a11 (patch) | |
| tree | 9e3c91a56ba45d4beb26f8ae84021b1897da460d /include/asm-sh/processor_64.h | |
| parent | 61434392f797cf89872bda87dff8b3395edf4108 (diff) | |
| parent | 26b63e995113dd48fde66c0d0d65eecc6df53172 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25:
sh: Fix up uImage compression type
remove include/asm-sh/floppy.h
sh: Fix TIF_USEDFPU clearing under FPU emulation.
sh: Fix occasional FPU register corruption under preempt.
Diffstat (limited to 'include/asm-sh/processor_64.h')
| -rw-r--r-- | include/asm-sh/processor_64.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-sh/processor_64.h b/include/asm-sh/processor_64.h index eda4bef448e9..88a2edf8fa5d 100644 --- a/include/asm-sh/processor_64.h +++ b/include/asm-sh/processor_64.h | |||
| @@ -112,6 +112,7 @@ extern struct sh_cpuinfo cpu_data[]; | |||
| 112 | #endif | 112 | #endif |
| 113 | 113 | ||
| 114 | #define SR_IMASK 0x000000f0 | 114 | #define SR_IMASK 0x000000f0 |
| 115 | #define SR_FD 0x00008000 | ||
| 115 | #define SR_SSTEP 0x08000000 | 116 | #define SR_SSTEP 0x08000000 |
| 116 | 117 | ||
| 117 | #ifndef __ASSEMBLY__ | 118 | #ifndef __ASSEMBLY__ |