diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-01 11:45:48 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-01 11:45:48 -0700 |
commit | 10027471a305c5491d23add394041120720e8a11 (patch) | |
tree | 9e3c91a56ba45d4beb26f8ae84021b1897da460d /arch/sh/kernel/cpu | |
parent | 61434392f797cf89872bda87dff8b3395edf4108 (diff) | |
parent | 26b63e995113dd48fde66c0d0d65eecc6df53172 (diff) | |
download | blackbird-op-linux-10027471a305c5491d23add394041120720e8a11.tar.gz blackbird-op-linux-10027471a305c5491d23add394041120720e8a11.zip |
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 'arch/sh/kernel/cpu')
-rw-r--r-- | arch/sh/kernel/cpu/sh2a/fpu.c | 1 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4/fpu.c | 1 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh5/fpu.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/arch/sh/kernel/cpu/sh2a/fpu.c b/arch/sh/kernel/cpu/sh2a/fpu.c index ff99562456fb..5627c0b3ffa8 100644 --- a/arch/sh/kernel/cpu/sh2a/fpu.c +++ b/arch/sh/kernel/cpu/sh2a/fpu.c @@ -13,6 +13,7 @@ #include <linux/signal.h> #include <asm/processor.h> #include <asm/io.h> +#include <asm/fpu.h> /* The PR (precision) bit in the FP Status Register must be clear when * an frchg instruction is executed, otherwise the instruction is undefined. diff --git a/arch/sh/kernel/cpu/sh4/fpu.c b/arch/sh/kernel/cpu/sh4/fpu.c index 817f9939cda6..8020796139f1 100644 --- a/arch/sh/kernel/cpu/sh4/fpu.c +++ b/arch/sh/kernel/cpu/sh4/fpu.c @@ -16,6 +16,7 @@ #include <asm/cpu/fpu.h> #include <asm/processor.h> #include <asm/system.h> +#include <asm/fpu.h> /* The PR (precision) bit in the FP Status Register must be clear when * an frchg instruction is executed, otherwise the instruction is undefined. diff --git a/arch/sh/kernel/cpu/sh5/fpu.c b/arch/sh/kernel/cpu/sh5/fpu.c index 30b76a94abf2..dd4f51ffb50e 100644 --- a/arch/sh/kernel/cpu/sh5/fpu.c +++ b/arch/sh/kernel/cpu/sh5/fpu.c @@ -17,6 +17,7 @@ #include <asm/processor.h> #include <asm/user.h> #include <asm/io.h> +#include <asm/fpu.h> /* * Initially load the FPU with signalling NANS. This bit pattern |