Updates to 2.5.47.

diff --git a/arch/um/Makefile-i386 b/arch/um/Makefile-i386
index 528c188e55b209455509b9808e0cfc417a1c7053..e4a66c4fbacf50be8dc5b7c15e097e81c4a81088 100644 (file)
--- a/arch/um/Makefile-i386
+++ b/arch/um/Makefile-i386
@@ -8,6 +8,9 @@ CFLAGS += -U__$(SUBARCH)__ -U$(SUBARCH)
 ELF_ARCH = $(SUBARCH)
 ELF_FORMAT = elf32-$(SUBARCH)
 
+OBJCOPYFLAGS  := -O binary -R .note -R .comment -S
+LDFLAGS_BLOB   := --format binary --oformat elf32-i386
+
 SYS_DIR                := $(ARCH_DIR)/include/sysdep-i386
 SYS_UTIL_DIR   := $(ARCH_DIR)/sys-i386/util
 

diff --git a/arch/um/kernel/sys_call_table.c b/arch/um/kernel/sys_call_table.c
index 682e78905a7b79df4aed4c644894eb5ef13a77e0..70bab83af29295ee9231869d87dabeea5dbfbd9c 100644 (file)
--- a/arch/um/kernel/sys_call_table.c
+++ b/arch/um/kernel/sys_call_table.c
@@ -85,6 +85,7 @@ extern syscall_handler_t sys_setgroups16;
 extern syscall_handler_t sys_symlink;
 extern syscall_handler_t sys_lstat;
 extern syscall_handler_t sys_readlink;
+extern syscall_handler_t sys_swapon;
 extern syscall_handler_t sys_uselib;
 extern syscall_handler_t sys_reboot;
 extern syscall_handler_t old_readdir;
@@ -111,6 +112,7 @@ extern syscall_handler_t sys_ni_syscall;
 extern syscall_handler_t sys_vhangup;
 extern syscall_handler_t sys_ni_syscall;
 extern syscall_handler_t sys_ni_syscall;
+extern syscall_handler_t sys_swapoff;
 extern syscall_handler_t sys_sysinfo;
 extern syscall_handler_t sys_ipc;
 extern syscall_handler_t sys_fsync;
@@ -233,6 +235,7 @@ extern syscall_handler_t sys_lookup_dcookie;
 extern syscall_handler_t sys_epoll_create;
 extern syscall_handler_t sys_epoll_ctl;
 extern syscall_handler_t sys_epoll_wait;
+extern syscall_handler_t sys_remap_file_pages;
 
 #if CONFIG_NFSD
 #define NFSSERVCTL sys_nfsserctl
@@ -244,7 +247,7 @@ extern syscall_handler_t um_mount;
 extern syscall_handler_t um_time;
 extern syscall_handler_t um_stime;
 
-#define LAST_GENERIC_SYSCALL __NR_sys_epoll_wait
+#define LAST_GENERIC_SYSCALL __NR_remap_file_pages
 
 #if LAST_GENERIC_SYSCALL > LAST_ARCH_SYSCALL
 #define LAST_SYSCALL LAST_GENERIC_SYSCALL
@@ -487,6 +490,7 @@ syscall_handler_t *sys_call_table[] = {
        [ __NR_sys_epoll_create ] = sys_epoll_create,
        [ __NR_sys_epoll_ctl ] = sys_epoll_ctl,
        [ __NR_sys_epoll_wait ] = sys_epoll_wait,
+        [ __NR_remap_file_pages ] = sys_remap_file_pages,
 
        ARCH_SYSCALLS
        [ LAST_SYSCALL + 1 ... NR_syscalls ] = 

diff --git a/arch/um/uml.lds.S b/arch/um/uml.lds.S
index b645066519c977449784ab20b1eacb32fc28ff18..c15bc24842c3bd54d7162f01c1aa5c1b86f32d1c 100644 (file)
--- a/arch/um/uml.lds.S
+++ b/arch/um/uml.lds.S
@@ -92,6 +92,11 @@ SECTIONS
   .uml.exitcall : { *(.uml.exitcall.exit) }
   __uml_exitcall_end = .;
 
+   . = ALIGN(4096);
+   __initramfs_start = .;
+   .init.ramfs : { *(.init.ramfs) }
+   __initramfs_end = .;
+ 
   .data.init : { *(.data.init) }
   .data    :
   {

diff --git a/include/asm-um/unistd.h b/include/asm-um/unistd.h
index 2ceb9c226c32987a237db6086d7294357827ef66..8fadf92e650ad77a5ba80371c9da1be5a42608f0 100644 (file)
--- a/include/asm-um/unistd.h
+++ b/include/asm-um/unistd.h
@@ -23,7 +23,7 @@ extern long sys_select(int n, fd_set *inp, fd_set *outp, fd_set *exp,
                       struct timeval *tvp);
 extern long sys_lseek(unsigned int fildes, unsigned long offset, int whence);
 extern long sys_read(unsigned int fildes, char *buf, int len);
-extern long sys_write(unsigned int fildes, char *buf, int len);
+extern long sys_write(int fildes, const char *buf, size_t len);
 
 #ifdef __KERNEL_SYSCALLS__