aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/uml
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
commit8bac0df4aefa6fedf0a7f2e05e936d9e5d658863 (patch)
treea45f5ffecac1c554723bdefb07e0931947cbc809 /target/linux/uml
parenta97304cf61f18ec35c4f9305970ed0014f83b6d4 (diff)
downloadupstream-8bac0df4aefa6fedf0a7f2e05e936d9e5d658863.tar.gz
upstream-8bac0df4aefa6fedf0a7f2e05e936d9e5d658863.tar.bz2
upstream-8bac0df4aefa6fedf0a7f2e05e936d9e5d658863.zip
linux: update 3.0 to 3.0.9
SVN-Revision: 29264
Diffstat (limited to 'target/linux/uml')
-rw-r--r--target/linux/uml/Makefile2
-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
3 files changed, 3 insertions, 5 deletions
diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile
index 1f7b3fbcad..f6c4586e28 100644
--- a/target/linux/uml/Makefile
+++ b/target/linux/uml/Makefile
@@ -23,7 +23,7 @@ BOARDNAME:=User Mode Linux
FEATURES:=ext4 audio
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.0.3
+LINUX_VERSION:=3.0.9
include $(INCLUDE_DIR)/target.mk
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