summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-07-20 10:59:21 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-07-20 10:59:21 +0000
commita452106e886da8d6d8b6d4e0256b125542b72692 (patch)
tree798e78d2556a397acb20c85de7ff237ac94e02f8 /target
parent832a33e52a311cf11eee98d60f674003b36b09b1 (diff)
[kernel] 2.6.{28,30}: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16934 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/024-mips_disable_fpu.patch18
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/004-extra_optimization.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/750-glamo-headers.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch2
4 files changed, 6 insertions, 18 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.28/024-mips_disable_fpu.patch b/target/linux/generic-2.6/patches-2.6.28/024-mips_disable_fpu.patch
index e71bf48f21..ded4b2125a 100644
--- a/target/linux/generic-2.6/patches-2.6.28/024-mips_disable_fpu.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/024-mips_disable_fpu.patch
@@ -6,11 +6,9 @@ precious blocks on an embedded system.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
--
-diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
-index 65d3b19..a467ee5 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -811,6 +811,17 @@ config I8259
+@@ -751,6 +751,17 @@ config I8259
config MIPS_BONITO64
bool
@@ -28,8 +26,6 @@ index 65d3b19..a467ee5 100644
config MIPS_MSC
bool
-diff --git a/arch/mips/math-emu/Makefile b/arch/mips/math-emu/Makefile
-index d547efd..7fdef24 100644
--- a/arch/mips/math-emu/Makefile
+++ b/arch/mips/math-emu/Makefile
@@ -2,12 +2,14 @@
@@ -49,8 +45,6 @@ index d547efd..7fdef24 100644
+ dp_sqrt.o sp_sqrt.o
EXTRA_CFLAGS += -Werror
-diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c
-index 890f779..9f4c767 100644
--- a/arch/mips/math-emu/cp1emu.c
+++ b/arch/mips/math-emu/cp1emu.c
@@ -56,6 +56,12 @@
@@ -77,7 +71,7 @@ index 890f779..9f4c767 100644
/* Control registers */
#define FPCREG_RID 0 /* $0 = revision id */
-@@ -1273,6 +1275,13 @@ int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
+@@ -1273,6 +1275,13 @@ int fpu_emulator_cop1Handler(struct pt_r
return sig;
}
@@ -91,11 +85,9 @@ index 890f779..9f4c767 100644
#ifdef CONFIG_DEBUG_FS
extern struct dentry *mips_debugfs_dir;
-diff --git a/arch/mips/math-emu/dsemul.c b/arch/mips/math-emu/dsemul.c
-index df7b9d9..9b42bfd 100644
--- 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, mips_instruction ir, unsigned long cpc)
+@@ -109,6 +109,7 @@ int mips_dsemul(struct pt_regs *regs, mi
return SIGILL; /* force out of emulation loop */
}
@@ -113,8 +105,6 @@ index df7b9d9..9b42bfd 100644
+ return 0;
+}
+#endif /* CONFIG_MIPS_FPU_EMU */
-diff --git a/arch/mips/math-emu/kernel_linkage.c b/arch/mips/math-emu/kernel_linkage.c
-index 52e6c58..211a399 100644
--- a/arch/mips/math-emu/kernel_linkage.c
+++ b/arch/mips/math-emu/kernel_linkage.c
@@ -29,6 +29,7 @@
@@ -125,7 +115,7 @@ index 52e6c58..211a399 100644
void fpu_emulator_init_fpu(void)
{
static int first = 1;
-@@ -112,4 +113,34 @@ int fpu_emulator_restore_context32(struct sigcontext32 __user *sc)
+@@ -112,4 +113,34 @@ int fpu_emulator_restore_context32(struc
return err;
}
diff --git a/target/linux/generic-2.6/patches-2.6.30/004-extra_optimization.patch b/target/linux/generic-2.6/patches-2.6.30/004-extra_optimization.patch
index 05fd5fbde4..018e673e20 100644
--- a/target/linux/generic-2.6/patches-2.6.30/004-extra_optimization.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/004-extra_optimization.patch
@@ -1,6 +1,6 @@
--- a/Makefile
+++ b/Makefile
-@@ -566,6 +566,9 @@ endif
+@@ -567,6 +567,9 @@ endif
NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
CHECKFLAGS += $(NOSTDINC_FLAGS)
diff --git a/target/linux/generic-2.6/patches-2.6.30/750-glamo-headers.patch b/target/linux/generic-2.6/patches-2.6.30/750-glamo-headers.patch
index 532e00a3a3..79fd131c1d 100644
--- a/target/linux/generic-2.6/patches-2.6.30/750-glamo-headers.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/750-glamo-headers.patch
@@ -8,8 +8,6 @@
#define FB_ACCEL_NEOMAGIC_NM2070 90 /* NeoMagic NM2070 */
#define FB_ACCEL_NEOMAGIC_NM2090 91 /* NeoMagic NM2090 */
#define FB_ACCEL_NEOMAGIC_NM2093 92 /* NeoMagic NM2093 */
-diff --git a/Kbuild b/Kbuild
-index 3f0eaa3..72699f0 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -75,6 +75,8 @@ header-y += genetlink.h
diff --git a/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch
index aad8f813d8..8ade08a8b6 100644
--- a/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch
@@ -116,7 +116,7 @@
void *caller)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
-@@ -728,6 +728,7 @@ static inline int shmem_lock(struct file
+@@ -726,6 +726,7 @@ static inline int shmem_lock(struct file
#endif
struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags);