aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/uml/patches-3.0
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2011-11-19 18:39:12 +0000
committerJonas Gorski <jogo@openwrt.org>2011-11-19 18:39:12 +0000
commit16fd48e131c7085f7e44527c007788e05da80476 (patch)
tree39e2cbceebad180ff668e938e073b12dae8f0ecc /target/linux/uml/patches-3.0
parent96285ef8bd36201c0187e8fd867c393b6c5a17d8 (diff)
downloadmaster-187ad058-16fd48e131c7085f7e44527c007788e05da80476.tar.gz
master-187ad058-16fd48e131c7085f7e44527c007788e05da80476.tar.bz2
master-187ad058-16fd48e131c7085f7e44527c007788e05da80476.zip
linux: update 3.0 to 3.0.9
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29264 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/uml/patches-3.0')
-rw-r--r--target/linux/uml/patches-3.0/002-export___sprintf_chk.patch4
-rw-r--r--target/linux/uml/patches-3.0/901-lib_zlib_deflate_visible.patch2
2 files changed, 2 insertions, 4 deletions
diff --git a/target/linux/uml/patches-3.0/002-export___sprintf_chk.patch b/target/linux/uml/patches-3.0/002-export___sprintf_chk.patch
index 1d3cf4911a..cda1ffe6f2 100644
--- a/target/linux/uml/patches-3.0/002-export___sprintf_chk.patch
+++ b/target/linux/uml/patches-3.0/002-export___sprintf_chk.patch
@@ -1,8 +1,6 @@
-diff --git a/arch/um/os-Linux/user_syms.c b/arch/um/os-Linux/user_syms.c
-index 05f5ea8..9e71e7e 100644
--- a/arch/um/os-Linux/user_syms.c
+++ b/arch/um/os-Linux/user_syms.c
-@@ -18,6 +18,9 @@ extern void *memmove(void *, const void *, size_t);
+@@ -18,6 +18,9 @@ extern void *memmove(void *, const void
extern void *memset(void *, int, size_t);
extern int printf(const char *, ...);
diff --git a/target/linux/uml/patches-3.0/901-lib_zlib_deflate_visible.patch b/target/linux/uml/patches-3.0/901-lib_zlib_deflate_visible.patch
index f4aba9bd7a..e9ec0cbc97 100644
--- a/target/linux/uml/patches-3.0/901-lib_zlib_deflate_visible.patch
+++ b/target/linux/uml/patches-3.0/901-lib_zlib_deflate_visible.patch
@@ -3,7 +3,7 @@ or as a module
--- a/lib/Kconfig
+++ b/lib/Kconfig
-@@ -98,7 +98,7 @@ config ZLIB_INFLATE
+@@ -91,7 +91,7 @@ config ZLIB_INFLATE
tristate
config ZLIB_DEFLATE