Update uml to 2.6.25.10

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11686 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 15 insertions, 8 deletions

diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile
index 022098a838..cede9f41ec 100644
--- a/target/linux/uml/Makefile
+++ b/target/linux/uml/Makefile
@@ -23,7 +23,7 @@ BOARDNAME:=User Mode Linux
 FEATURES:=broken ext2
 LINUX_CONFIG:=$(CURDIR)/config/$(ARCH)
 
-LINUX_VERSION:=2.6.24.7
+LINUX_VERSION:=2.6.25.10
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/uml/config/i386 b/target/linux/uml/config/i386
index 08756010af..19c41ff480 100644
--- a/target/linux/uml/config/i386
+++ b/target/linux/uml/config/i386
@@ -2,6 +2,7 @@
 # CONFIG_64BIT is not set
 CONFIG_ARCH_HAS_SC_SIGNALS=y
 CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA=y
+CONFIG_ARCH_SUPPORTS_AOUT=y
 # CONFIG_ATM is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_BINFMT_AOUT is not set
@@ -10,10 +11,15 @@ CONFIG_BLK_DEV_COW_COMMON=y
 CONFIG_BLK_DEV_UBD=y
 CONFIG_BLK_DEV_UBD_SYNC=y
 # CONFIG_BT is not set
+CONFIG_CLASSIC_RCU=y
 CONFIG_CON_CHAN="xterm"
 CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
 CONFIG_CRAMFS=y
+CONFIG_CRYPTO_AEAD=m
 # CONFIG_CRYPTO_AES_586 is not set
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_GF128MUL=m
+# CONFIG_CRYPTO_SALSA20_586 is not set
 # CONFIG_CRYPTO_TWOFISH_586 is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_STACK_USAGE is not set
@@ -34,13 +40,12 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 # CONFIG_GENERIC_CPU is not set
 # CONFIG_HAMRADIO is not set
 CONFIG_HAS_DMA=y
+# CONFIG_HAVE_KPROBES is not set
+# CONFIG_HAVE_KRETPROBES is not set
+# CONFIG_HAVE_OPROFILE is not set
 # CONFIG_HIGHMEM is not set
 CONFIG_HOSTAUDIO=m
 CONFIG_HOSTFS=y
-# CONFIG_HOST_VMSPLIT_1G is not set
-# CONFIG_HOST_VMSPLIT_2G is not set
-CONFIG_HOST_VMSPLIT_3G=y
-# CONFIG_HOST_VMSPLIT_3G_OPT is not set
 # CONFIG_HPPFS is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_IFB is not set
@@ -58,6 +63,8 @@ CONFIG_LBD=y
 CONFIG_LD_SCRIPT_STATIC=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LZO_COMPRESS=m
+CONFIG_LZO_DECOMPRESS=m
 # CONFIG_M386 is not set
 # CONFIG_M486 is not set
 # CONFIG_M586 is not set
@@ -88,7 +95,7 @@ CONFIG_MPENTIUMII=y
 # CONFIG_MWINCHIP2 is not set
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MWINCHIPC6 is not set
-CONFIG_NEST_LEVEL=0
+CONFIG_NAMESPACES=y
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3_ACL=y
 # CONFIG_NFSD_V4 is not set
@@ -105,6 +112,7 @@ CONFIG_NULL_CHAN=y
 CONFIG_PORT_CHAN=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_PRINT_QUOTA_WARNING=y
+CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_PTY_CHAN=y
 CONFIG_QFMT_V1=y
 CONFIG_QFMT_V2=y
@@ -116,7 +124,6 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SEMAPHORE_SLEEPERS=y
 CONFIG_SLABINFO=y
-# CONFIG_SMP is not set
 CONFIG_SOFT_WATCHDOG=m
 # CONFIG_SPARSEMEM_STATIC is not set
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
@@ -129,7 +136,6 @@ CONFIG_STDERR_CONSOLE=y
 CONFIG_STDIO_CONSOLE=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_TICK_ONESHOT=y
-CONFIG_TOP_ADDR=0xC0000000
 # CONFIG_TRACE_IRQFLAGS_SUPPORT is not set
 CONFIG_TTY_CHAN=y
 CONFIG_UID16=y
@@ -153,6 +159,7 @@ CONFIG_X86_32=y
 CONFIG_X86_BSWAP=y
 CONFIG_X86_CMOV=y
 CONFIG_X86_CMPXCHG=y
+CONFIG_X86_DEBUGCTLMSR=y
 CONFIG_X86_GENERIC=y
 CONFIG_X86_GOOD_APIC=y
 CONFIG_X86_INTEL_USERCOPY=y