Skip to contentSkip to conversation

UML - Code cleanup

PATCH New Jeff Dike 1 participant 1 message Sep 17, 2004 User-mode Linux (UML)

lore
Share & tools
lore

Jeff Dike

author
#0 lore raw

PATCH 1/1 UML - Code cleanup

Here's another batch of "obviously harmless" changes:
comments
unsigned long -> __u32 changes for some data that needs to be 32 bits cleanups
removal of an unused declaration
rearrangement of includes

arch/um/drivers/chan_kern.c +2 -0
Index: 2.6.9-rc2/arch/um/drivers/chan_kern.c
===================================================================
@@ -106,6 +106,8 @@
 	return(n);
 }
 
+/* XXX Trivial wrapper around os_write_file */
+
 int generic_write(int fd, const char *buf, int n, void *unused)
 {
 	return(os_write_file(fd, buf, n));
arch/um/drivers/cow_user.c +2 -2
Index: 2.6.9-rc2/arch/um/drivers/cow_user.c
===================================================================
@@ -27,8 +27,8 @@
 #define PATH_LEN_V2 MAXPATHLEN
 
 struct cow_header_v2 {
-	unsigned long magic;
-	unsigned long version;
+	__u32 magic;
+	__u32 version;
 	char backing_file[PATH_LEN_V2];
 	time_t mtime;
 	__u64 size;
arch/um/drivers/hostaudio_kern.c +18 -29

144 lines not on this page · raw message

arch/um/include/user_util.h +0 -1
Index: 2.6.9-rc2/arch/um/include/user_util.h
===================================================================
@@ -74,7 +74,6 @@
 extern void tracer_panic(char *msg, ...);
 extern char *get_umid(int only_if_set);
 extern void do_longjmp(void *p, int val);
-extern void suspend_new_thread(int fd);
 extern int detach(int pid, int sig);
 extern int attach(int pid);
 extern void kill_child_dead(int pid);
arch/um/kernel/uaccess_user.c +1 -1
Index: 2.6.9-rc2/arch/um/kernel/uaccess_user.c
===================================================================
@@ -17,8 +17,8 @@
 					int n), int *faulted_out)
 {
 	unsigned long *faddrp = (unsigned long *) fault_addr, ret;
-	sigjmp_buf jbuf;
 
+	sigjmp_buf jbuf;
 	*fault_catcher = &jbuf;
 	if(sigsetjmp(jbuf, 1) == 0){
 		(*op)(to, from, n);
arch/um/kernel/um_arch.c +0 -1
Index: 2.6.9-rc2/arch/um/kernel/um_arch.c
===================================================================
@@ -27,7 +27,6 @@
 #include "user_util.h"
 #include "kern_util.h"
 #include "kern.h"
-#include "mprot.h"
 #include "mem_user.h"
 #include "mem.h"
 #include "umid.h"
arch/um/kernel/user_util.c +1 -1
Index: 2.6.9-rc2/arch/um/kernel/user_util.c
===================================================================
@@ -7,8 +7,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <limits.h>
-#include <sys/mman.h> 
 #include <setjmp.h>
+#include <sys/mman.h> 
 #include <sys/stat.h>
 #include <sys/ptrace.h>
 #include <sys/utsname.h>