Updated to 2.5.48

arch/um/kernel/sys_call_table.c

@@ -125,10 +125,8 @@ extern syscall_handler_t sys_ni_syscall;
 extern syscall_handler_t sys_adjtimex;
 extern syscall_handler_t sys_mprotect;
 extern syscall_handler_t sys_sigprocmask;
-extern syscall_handler_t sys_create_module;
 extern syscall_handler_t sys_init_module;
 extern syscall_handler_t sys_delete_module;
-extern syscall_handler_t sys_get_kernel_syms;
 extern syscall_handler_t sys_quotactl;
 extern syscall_handler_t sys_getpgid;
 extern syscall_handler_t sys_fchdir;
@@ -162,7 +160,6 @@ extern syscall_handler_t sys_mremap;
 extern syscall_handler_t sys_setresuid16;
 extern syscall_handler_t sys_getresuid16;
 extern syscall_handler_t sys_ni_syscall;
-extern syscall_handler_t sys_query_module;
 extern syscall_handler_t sys_poll;
 extern syscall_handler_t sys_nfsservctl;
 extern syscall_handler_t sys_setresgid16;
@@ -236,9 +233,10 @@ 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;
+extern syscall_handler_t sys_set_tid_address;
 
 #if CONFIG_NFSD
-#define NFSSERVCTL sys_nfsserctl
+#define NFSSERVCTL sys_nfsservctl
 #else
 #define NFSSERVCTL sys_ni_syscall
 #endif
@@ -247,7 +245,7 @@ extern syscall_handler_t um_mount;
 extern syscall_handler_t um_time;
 extern syscall_handler_t um_stime;
 
-#define LAST_GENERIC_SYSCALL __NR_remap_file_pages
+#define LAST_GENERIC_SYSCALL __NR_set_tid_address
 
 #if LAST_GENERIC_SYSCALL > LAST_ARCH_SYSCALL
 #define LAST_SYSCALL LAST_GENERIC_SYSCALL
@@ -385,10 +383,10 @@ syscall_handler_t *sys_call_table[] = {
 	[ __NR_adjtimex ] = sys_adjtimex,
 	[ __NR_mprotect ] = sys_mprotect,
 	[ __NR_sigprocmask ] = sys_sigprocmask,
-	[ __NR_create_module ] = sys_create_module,
+	[ __NR_create_module ] = sys_ni_syscall,
 	[ __NR_init_module ] = sys_init_module,
 	[ __NR_delete_module ] = sys_delete_module,
-	[ __NR_get_kernel_syms ] = sys_get_kernel_syms,
+	[ __NR_get_kernel_syms ] = sys_ni_syscall,
 	[ __NR_quotactl ] = sys_quotactl,
 	[ __NR_getpgid ] = sys_getpgid,
 	[ __NR_fchdir ] = sys_fchdir,
@@ -425,7 +423,7 @@ syscall_handler_t *sys_call_table[] = {
 	[ __NR_setresuid ] = sys_setresuid16,
 	[ __NR_getresuid ] = sys_getresuid16,
 	[ __NR_vm86 ] = sys_ni_syscall,
-	[ __NR_query_module ] = sys_query_module,
+	[ __NR_query_module ] = sys_ni_syscall,
 	[ __NR_poll ] = sys_poll,
 	[ __NR_nfsservctl ] = NFSSERVCTL,
 	[ __NR_setresgid ] = sys_setresgid16,
@@ -491,6 +489,7 @@ syscall_handler_t *sys_call_table[] = {
 	[ __NR_sys_epoll_ctl ] = sys_epoll_ctl,
 	[ __NR_sys_epoll_wait ] = sys_epoll_wait,
         [ __NR_remap_file_pages ] = sys_remap_file_pages,
+        [ __NR_set_tid_address ] = sys_set_tid_address,
 
 	ARCH_SYSCALLS
 	[ LAST_SYSCALL + 1 ... NR_syscalls ] = 

arch/um/kernel/sysrq.c

@@ -31,11 +31,11 @@ static inline int kernel_text_address(unsigned long addr)
 	    addr <= (unsigned long) &_etext)
 		return 1;
 
-	for (mod = module_list; mod != &kernel_module; mod = mod->next) {
+	list_for_each_entry(mod, &modules, list) {
 		/* mod_bound tests for addr being inside the vmalloc'ed
 		 * module area. Of course it'd be better to test only
 		 * for the .text subset... */
-		if (mod_bound(addr, 0, mod)) {
+		if (mod_bound((void *) addr, 0, mod)) {
 			retval = 1;
 			break;
 		}

arch/um/uml.lds.S

@@ -38,6 +38,7 @@ SECTIONS
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
 
+  . = ALIGN(64);
   __start___ksymtab = .;	/* Kernel symbol table */
   __ksymtab : { *(__ksymtab) }
   __stop___ksymtab = .;

include/asm-um/uaccess.h

@@ -164,7 +164,7 @@ static inline int clear_user(void *mem, int len)
 extern int __do_strnlen_user(const char *str, unsigned long n,
 			     void **fault_addr, void **fault_catcher);
 
-static inline int strnlen_user(void *str, int len)
+static inline int strnlen_user(const void *str, int len)
 {
 	return(__do_strnlen_user(str, len,
 				 &current->thread.fault_addr,