From d3bd4c6457cd7137418eb560a76f88a2913ea98b Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 9 Aug 2011 13:13:22 +0000
Subject: [PATCH] [uml] update to 3.0.1

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27943 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/uml/Makefile                          |  2 +-
 .../001-gcc4_unit_at_a_time_i386_fix.patch         | 11 +++++++++++
 .../uml/patches-3.0/002-export___sprintf_chk.patch | 14 ++++++++++++++
 .../patches-3.0/901-lib_zlib_deflate_visible.patch | 14 ++++++++++++++
 4 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 target/linux/uml/patches-3.0/001-gcc4_unit_at_a_time_i386_fix.patch
 create mode 100644 target/linux/uml/patches-3.0/002-export___sprintf_chk.patch
 create mode 100644 target/linux/uml/patches-3.0/901-lib_zlib_deflate_visible.patch

diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile
index a8e84e11f..a91aac83b 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:=2.6.39.2
+LINUX_VERSION:=3.0.1
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/uml/patches-3.0/001-gcc4_unit_at_a_time_i386_fix.patch b/target/linux/uml/patches-3.0/001-gcc4_unit_at_a_time_i386_fix.patch
new file mode 100644
index 000000000..442c0ec76
--- /dev/null
+++ b/target/linux/uml/patches-3.0/001-gcc4_unit_at_a_time_i386_fix.patch
@@ -0,0 +1,11 @@
+--- a/arch/um/Makefile-i386
++++ b/arch/um/Makefile-i386
+@@ -35,7 +35,7 @@ cflags-y += -ffreestanding
+ # Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use
+ # a lot more stack due to the lack of sharing of stacklots.  Also, gcc
+ # 4.3.0 needs -funit-at-a-time for extern inline functions.
+-KBUILD_CFLAGS += $(shell if [ $(call cc-version) -lt 0400 ] ; then \
++KBUILD_CFLAGS += $(shell if [ $(call cc-version) -lt 0403 ] ; then \
+ 			echo $(call cc-option,-fno-unit-at-a-time); \
+ 			else echo $(call cc-option,-funit-at-a-time); fi ;)
+ 
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
new file mode 100644
index 000000000..1d3cf4911
--- /dev/null
+++ b/target/linux/uml/patches-3.0/002-export___sprintf_chk.patch
@@ -0,0 +1,14 @@
+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);
+ extern void *memset(void *, int, size_t);
+ extern int printf(const char *, ...);
+ 
++extern int __sprintf_chk(char *str, int flag, size_t strlen, const char *format);
++EXPORT_SYMBOL(__sprintf_chk);
++
+ /* If it's not defined, the export is included in lib/string.c.*/
+ #ifdef __HAVE_ARCH_STRSTR
+ EXPORT_SYMBOL(strstr);
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
new file mode 100644
index 000000000..f4aba9bd7
--- /dev/null
+++ b/target/linux/uml/patches-3.0/901-lib_zlib_deflate_visible.patch
@@ -0,0 +1,14 @@
+make ZLIB_DEFLATE visible, so that we can choose whether we want it built-in
+or as a module
+
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -98,7 +98,7 @@ config ZLIB_INFLATE
+ 	tristate
+ 
+ config ZLIB_DEFLATE
+-	tristate
++	tristate "Zlib compression"
+ 
+ config LZO_COMPRESS
+ 	tristate
-- 
2.20.1