aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/uml
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-08-22 15:37:19 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-08-22 15:37:19 +0000
commit184c6b06f2bb29b693084174908c7a0f1b46e3d2 (patch)
treeeb6e3d897cf739fd60e1728c475b35141a76b0a4 /target/linux/uml
parentbe1a9ff41dfeed9e00f165e6a661e26ccaa5549c (diff)
downloadupstream-184c6b06f2bb29b693084174908c7a0f1b46e3d2.tar.gz
upstream-184c6b06f2bb29b693084174908c7a0f1b46e3d2.tar.bz2
upstream-184c6b06f2bb29b693084174908c7a0f1b46e3d2.zip
update to 2.6.26.3 and 2.6.25.16
SVN-Revision: 12371
Diffstat (limited to 'target/linux/uml')
-rw-r--r--target/linux/uml/Makefile2
-rw-r--r--target/linux/uml/patches/001-gcc4_unit_at_a_time_i386_fix.patch6
2 files changed, 3 insertions, 5 deletions
diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile
index 3dd9a986ab..e09751314b 100644
--- a/target/linux/uml/Makefile
+++ b/target/linux/uml/Makefile
@@ -23,7 +23,7 @@ BOARDNAME:=User Mode Linux
FEATURES:=ext2
LINUX_CONFIG:=$(CURDIR)/config/$(ARCH)
-LINUX_VERSION:=2.6.26.2
+LINUX_VERSION:=2.6.26.3
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/uml/patches/001-gcc4_unit_at_a_time_i386_fix.patch b/target/linux/uml/patches/001-gcc4_unit_at_a_time_i386_fix.patch
index 17c08cd6c5..200c684577 100644
--- a/target/linux/uml/patches/001-gcc4_unit_at_a_time_i386_fix.patch
+++ b/target/linux/uml/patches/001-gcc4_unit_at_a_time_i386_fix.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.26/arch/um/Makefile-i386
-===================================================================
---- linux-2.6.26.orig/arch/um/Makefile-i386 2008-07-28 13:43:40.412036547 +0200
-+++ linux-2.6.26/arch/um/Makefile-i386 2008-07-28 13:44:00.234033125 +0200
+--- a/arch/um/Makefile-i386
++++ b/arch/um/Makefile-i386
@@ -35,7 +35,7 @@
# 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