Re: [uml-devel] [PATCH] Task Size Init cleanup

[Jeff Dike <jdike@addtoit.com>]

On Mon, May 22, 2006 at 11:26:49PM +0200, tyler@agat.net wrote:
> I was looking at the code of the UML and more precisely at the functions
> set_task_sizes_tt and set_task_sizes_skas. I noticed that these 2
> functions take a paramater (arg) which is not used : the function is
> always called with the value 0.
> 
> I suppose that this value might change in the future (or even can be
> configured), so I added a constant in mem_user.h file.
> 
> Also, I rounded CONFIG_HOST_TASk_SIZE to a 4M.

What I have in my tree is below.  Can I get a Signed-off-by for it
from you so I can send it to mainline?

				Jeff


Index: linux-2.6.16-rc-mm/arch/um/include/mem_user.h
===================================================================
--- linux-2.6.16-rc-mm.orig/arch/um/include/mem_user.h	2006-06-11 14:27:37.000000000 -0400
+++ linux-2.6.16-rc-mm/arch/um/include/mem_user.h	2006-06-11 14:52:53.000000000 -0400
@@ -44,6 +44,7 @@ struct iomem_region {
 extern struct iomem_region *iomem_regions;
 extern int iomem_size;
 
+#define DEFAULT_HOST_TASK_SIZE			0
 #define ROUND_4M(n) ((((unsigned long) (n)) + (1 << 22)) & ~((1 << 22) - 1))
 
 extern unsigned long host_task_size;
Index: linux-2.6.16-rc-mm/arch/um/kernel/skas/mem.c
===================================================================
--- linux-2.6.16-rc-mm.orig/arch/um/kernel/skas/mem.c	2006-06-11 14:27:37.000000000 -0400
+++ linux-2.6.16-rc-mm/arch/um/kernel/skas/mem.c	2006-06-11 14:52:53.000000000 -0400
@@ -9,14 +9,14 @@
 #include "mem_user.h"
 #include "skas.h"
 
-unsigned long set_task_sizes_skas(int arg, unsigned long *host_size_out, 
+unsigned long set_task_sizes_skas(unsigned long *host_size_out,
 				  unsigned long *task_size_out)
 {
 	/* Round up to the nearest 4M */
-	unsigned long top = ROUND_4M((unsigned long) &arg);
+	unsigned long top = ROUND_4M((unsigned long) &host_size_out);
 
 #ifdef CONFIG_HOST_TASK_SIZE
-	*host_size_out = CONFIG_HOST_TASK_SIZE;
+	*host_size_out = ROUND_4M(CONFIG_HOST_TASK_SIZE);
 	*task_size_out = CONFIG_HOST_TASK_SIZE;
 #else
 	*host_size_out = top;
@@ -24,16 +24,5 @@ unsigned long set_task_sizes_skas(int ar
 		*task_size_out = top;
 	else *task_size_out = CONFIG_STUB_START & PGDIR_MASK;
 #endif
-	return(((unsigned long) set_task_sizes_skas) & ~0xffffff);
+	return ((unsigned long) set_task_sizes_skas) & ~0xffffff;
 }
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
Index: linux-2.6.16-rc-mm/arch/um/kernel/tt/mem.c
===================================================================
--- linux-2.6.16-rc-mm.orig/arch/um/kernel/tt/mem.c	2006-06-11 14:27:37.000000000 -0400
+++ linux-2.6.16-rc-mm/arch/um/kernel/tt/mem.c	2006-06-11 14:52:53.000000000 -0400
@@ -24,22 +24,11 @@ void before_mem_tt(unsigned long brk_sta
 #define SIZE ((CONFIG_NEST_LEVEL + CONFIG_KERNEL_HALF_GIGS) * 0x20000000)
 #define START (CONFIG_TOP_ADDR - SIZE)
 
-unsigned long set_task_sizes_tt(int arg, unsigned long *host_size_out, 
+unsigned long set_task_sizes_tt(unsigned long *host_size_out,
 				unsigned long *task_size_out)
 {
 	/* Round up to the nearest 4M */
-	*host_size_out = ROUND_4M((unsigned long) &arg);
+	*host_size_out = ROUND_4M((unsigned long) &host_size_out);
 	*task_size_out = START;
-	return(START);
+	return START;
 }
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
Index: linux-2.6.16-rc-mm/arch/um/kernel/um_arch.c
===================================================================
--- linux-2.6.16-rc-mm.orig/arch/um/kernel/um_arch.c	2006-06-11 14:28:52.000000000 -0400
+++ linux-2.6.16-rc-mm/arch/um/kernel/um_arch.c	2006-06-28 13:07:29.000000000 -0400
@@ -374,7 +374,7 @@ int linux_main(int argc, char **argv)
 
 	printf("UML running in %s mode\n", mode);
 
-	uml_start = CHOOSE_MODE_PROC(set_task_sizes_tt, set_task_sizes_skas, 0,
+	uml_start = CHOOSE_MODE_PROC(set_task_sizes_tt, set_task_sizes_skas,
 				     &host_task_size, &task_size);
 
 	/*
Index: linux-2.6.16-rc-mm/arch/um/include/skas/mode_kern_skas.h
===================================================================
--- linux-2.6.16-rc-mm.orig/arch/um/include/skas/mode_kern_skas.h	2006-06-11 14:27:37.000000000 -0400
+++ linux-2.6.16-rc-mm/arch/um/include/skas/mode_kern_skas.h	2006-06-11 14:52:53.000000000 -0400
@@ -29,7 +29,7 @@ extern void flush_tlb_mm_skas(struct mm_
 extern void force_flush_all_skas(void);
 extern long execute_syscall_skas(void *r);
 extern void before_mem_skas(unsigned long unused);
-extern unsigned long set_task_sizes_skas(int arg, unsigned long *host_size_out,
+extern unsigned long set_task_sizes_skas(unsigned long *host_size_out,
 					 unsigned long *task_size_out);
 extern int start_uml_skas(void);
 extern int external_pid_skas(struct task_struct *task);
Index: linux-2.6.16-rc-mm/arch/um/include/tt/mode_kern_tt.h
===================================================================
--- linux-2.6.16-rc-mm.orig/arch/um/include/tt/mode_kern_tt.h	2006-06-11 14:27:37.000000000 -0400
+++ linux-2.6.16-rc-mm/arch/um/include/tt/mode_kern_tt.h	2006-06-11 14:52:53.000000000 -0400
@@ -30,7 +30,7 @@ extern void flush_tlb_mm_tt(struct mm_st
 extern void force_flush_all_tt(void);
 extern long execute_syscall_tt(void *r);
 extern void before_mem_tt(unsigned long brk_start);
-extern unsigned long set_task_sizes_tt(int arg, unsigned long *host_size_out,
+extern unsigned long set_task_sizes_tt(unsigned long *host_size_out,
 				       unsigned long *task_size_out);
 extern int start_uml_tt(void);
 extern int external_pid_tt(struct task_struct *task);

Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel