From 5242105c94aabcf1c5c5ddffa531978a4ab65ae1 Mon Sep 17 00:00:00 2001 From: florian Date: Fri, 29 May 2009 09:09:32 +0000 Subject: [PATCH] [kernel] refresh generic-2.6.29 patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16169 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic-2.6/patches-2.6.29/022-mips_div64_gcc4.4.0.patch | 2 -- target/linux/generic-2.6/patches-2.6.29/971-ocf_20080917.patch | 2 +- target/linux/generic-2.6/patches-2.6.29/980-vm_exports.patch | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/target/linux/generic-2.6/patches-2.6.29/022-mips_div64_gcc4.4.0.patch b/target/linux/generic-2.6/patches-2.6.29/022-mips_div64_gcc4.4.0.patch index a116cf437a..a549d616cd 100644 --- a/target/linux/generic-2.6/patches-2.6.29/022-mips_div64_gcc4.4.0.patch +++ b/target/linux/generic-2.6/patches-2.6.29/022-mips_div64_gcc4.4.0.patch @@ -11,8 +11,6 @@ which was considered dangerous and removed for gcc 4.4.0. Signed-off-by: Ralf Baechle --- -diff --git a/arch/mips/include/asm/div64.h b/arch/mips/include/asm/div64.h -index d1d6991..dc5ea57 100644 --- a/arch/mips/include/asm/div64.h +++ b/arch/mips/include/asm/div64.h @@ -6,105 +6,63 @@ diff --git a/target/linux/generic-2.6/patches-2.6.29/971-ocf_20080917.patch b/target/linux/generic-2.6/patches-2.6.29/971-ocf_20080917.patch index 66571700a7..97eeef8c8c 100644 --- a/target/linux/generic-2.6/patches-2.6.29/971-ocf_20080917.patch +++ b/target/linux/generic-2.6/patches-2.6.29/971-ocf_20080917.patch @@ -88,7 +88,7 @@ /********************************************************************* --- a/fs/fcntl.c +++ b/fs/fcntl.c -@@ -140,6 +140,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde +@@ -142,6 +142,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde } return ret; } diff --git a/target/linux/generic-2.6/patches-2.6.29/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.29/980-vm_exports.patch index 18ed895727..63819ec8e7 100644 --- a/target/linux/generic-2.6/patches-2.6.29/980-vm_exports.patch +++ b/target/linux/generic-2.6/patches-2.6.29/980-vm_exports.patch @@ -86,7 +86,7 @@ /** * zap_vma_ptes - remove ptes mapping the vma -@@ -2387,6 +2388,7 @@ int vmtruncate_range(struct inode *inode +@@ -2433,6 +2434,7 @@ int vmtruncate_range(struct inode *inode return 0; } -- 2.11.0