diff options
author | Florian Fainelli <florian@openwrt.org> | 2012-10-24 13:05:22 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2012-10-24 13:05:22 +0000 |
commit | dcde44e37ed89b02bf98c89c9d20eb7097e21707 (patch) | |
tree | b152afa6fd38537133c7a67e6aeff8476342d5a0 /target/linux/generic/patches-3.6/304-mips_disable_fpu.patch | |
parent | 59d0f03c9af97f38ddb4b99d9a86fa845e1fe170 (diff) | |
download | upstream-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.gz upstream-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.bz2 upstream-dcde44e37ed89b02bf98c89c9d20eb7097e21707.zip |
[kernel] make all 3.6 patches apply and build
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33911 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6/304-mips_disable_fpu.patch')
-rw-r--r-- | target/linux/generic/patches-3.6/304-mips_disable_fpu.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.6/304-mips_disable_fpu.patch b/target/linux/generic/patches-3.6/304-mips_disable_fpu.patch index e747feac61..dab490ab4f 100644 --- a/target/linux/generic/patches-3.6/304-mips_disable_fpu.patch +++ b/target/linux/generic/patches-3.6/304-mips_disable_fpu.patch @@ -8,7 +8,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org> -- --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -961,6 +961,17 @@ config I8259 +@@ -978,6 +978,17 @@ config I8259 config MIPS_BONITO64 bool @@ -92,7 +92,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org> +#endif /* CONFIG_MIPS_FPU_EMU */ --- a/arch/mips/math-emu/dsemul.c +++ b/arch/mips/math-emu/dsemul.c -@@ -109,6 +109,7 @@ int mips_dsemul(struct pt_regs *regs, mi +@@ -108,6 +108,7 @@ int mips_dsemul(struct pt_regs *regs, mi return SIGILL; /* force out of emulation loop */ } @@ -100,7 +100,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org> int do_dsemulret(struct pt_regs *xcp) { struct emuframe __user *fr; -@@ -165,3 +166,9 @@ int do_dsemulret(struct pt_regs *xcp) +@@ -164,3 +165,9 @@ int do_dsemulret(struct pt_regs *xcp) return 1; } |