From: Florian Fainelli <florian@openwrt.org>
Date: Fri, 29 May 2009 09:09:32 +0000 (+0000)
Subject: refresh generic-2.6.29 patches
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=12c8b488f79c77870d64bedc781c460d6e87a429;p=openwrt%2Fstaging%2Frobimarko.git

refresh generic-2.6.29 patches

SVN-Revision: 16169
---

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 <ralf@linux-mips.org>
 ---
 
-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;
  }