[patch 1/1] uml: remove jail mode + other leftovers

[patch 1/1] uml: remove jail mode + other leftovers

[blaisorblade]

This var is currently useless, as it's apparent from reading the code. Until
2.6.11 it was used in some code related to jail mode, in the same proc.:

        if(jail){
		while(!reading) sched_yield();
	}

jail mode has been dropped, together with that use, so let's finish dropping
this.

Also, remove some other useless definitions I met.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
---

 linux-2.6.12-paolo/arch/um/kernel/tt/process_kern.c |    6 ------
 linux-2.6.12-paolo/arch/um/kernel/um_arch.c         |    6 ------
 linux-2.6.12-paolo/include/asm-um/pgtable.h         |    8 --------
 3 files changed, 20 deletions(-)

diff -puN arch/um/kernel/tt/process_kern.c~uml-remove-jail-rem arch/um/kernel/tt/process_kern.c
--- linux-2.6.12/arch/um/kernel/tt/process_kern.c~uml-remove-jail-rem	2005-05-01 18:34:35.000000000 +0200
+++ linux-2.6.12-paolo/arch/um/kernel/tt/process_kern.c	2005-05-01 18:34:35.000000000 +0200
@@ -32,10 +32,6 @@ void *switch_to_tt(void *prev, void *nex
 	unsigned long flags;
 	int err, vtalrm, alrm, prof, cpu;
 	char c;
-	/* jailing and SMP are incompatible, so this doesn't need to be 
-	 * made per-cpu 
-	 */
-	static int reading;
 
 	from = prev;
 	to = next;
@@ -59,12 +55,10 @@ void *switch_to_tt(void *prev, void *nex
 	c = 0;
 	set_current(to);
 
-	reading = 0;
 	err = os_write_file(to->thread.mode.tt.switch_pipe[1], &c, sizeof(c));
 	if(err != sizeof(c))
 		panic("write of switch_pipe failed, err = %d", -err);
 
-	reading = 1;
 	if((from->exit_state == EXIT_ZOMBIE) ||
 	   (from->exit_state == EXIT_DEAD))
 		os_kill_process(os_getpid(), 0);
diff -puN arch/um/kernel/um_arch.c~uml-remove-jail-rem arch/um/kernel/um_arch.c
--- linux-2.6.12/arch/um/kernel/um_arch.c~uml-remove-jail-rem	2005-05-01 18:34:54.000000000 +0200
+++ linux-2.6.12-paolo/arch/um/kernel/um_arch.c	2005-05-01 18:36:42.000000000 +0200
@@ -110,12 +110,6 @@ struct seq_operations cpuinfo_op = {
 	.show	= show_cpuinfo,
 };
 
-pte_t * __bad_pagetable(void)
-{
-	panic("Someone should implement __bad_pagetable");
-	return(NULL);
-}
-
 /* Set in linux_main */
 unsigned long host_task_size;
 unsigned long task_size;
diff -puN include/asm-um/pgtable.h~uml-remove-jail-rem include/asm-um/pgtable.h
--- linux-2.6.12/include/asm-um/pgtable.h~uml-remove-jail-rem	2005-05-01 18:35:18.000000000 +0200
+++ linux-2.6.12-paolo/include/asm-um/pgtable.h	2005-05-01 18:36:33.000000000 +0200
@@ -114,17 +114,9 @@ extern unsigned long end_iomem;
 extern unsigned long pg0[1024];
 
 /*
- * BAD_PAGETABLE is used when we need a bogus page-table, while
- * BAD_PAGE is used for a bogus page.
- *
  * ZERO_PAGE is a global shared page that is always zero: used
  * for zero-mapped memory areas etc..
  */
-extern pte_t __bad_page(void);
-extern pte_t * __bad_pagetable(void);
-
-#define BAD_PAGETABLE __bad_pagetable()
-#define BAD_PAGE __bad_page()
 
 #define ZERO_PAGE(vaddr) virt_to_page(empty_zero_page)
 
_

Re: [patch 1/1] uml: remove jail mode + other leftovers

[Jeff Dike]

On Sun, May 01, 2005 at 06:38:15PM +0200, blaisorblade@yahoo.it wrote:
> 
> This var is currently useless, as it's apparent from reading the code. Until
> 2.6.11 it was used in some code related to jail mode, in the same proc.:
> 
>         if(jail){
> 		while(!reading) sched_yield();
> 	}
> 
> jail mode has been dropped, together with that use, so let's finish dropping
> this.
> 
> Also, remove some other useless definitions I met.
> 
> Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

Acked-by: Jeff Dike <jdike@addtoit.com>