aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-05-29 09:09:32 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-05-29 09:09:32 +0000
commit12c8b488f79c77870d64bedc781c460d6e87a429 (patch)
tree30e345bf846e5bfdf49d6027cd9f6514d499cb49 /target
parent9252651252a6f756e92b0a2ea07b77f702b0518f (diff)
downloadupstream-12c8b488f79c77870d64bedc781c460d6e87a429.tar.gz
upstream-12c8b488f79c77870d64bedc781c460d6e87a429.tar.bz2
upstream-12c8b488f79c77870d64bedc781c460d6e87a429.zip
refresh generic-2.6.29 patches
SVN-Revision: 16169
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic-2.6/patches-2.6.29/022-mips_div64_gcc4.4.0.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.29/971-ocf_20080917.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.29/980-vm_exports.patch2
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 <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;
}