Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6e34c6a authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] uml: _switch_to code consolidation 



This patch moves code that is in both switch_to_tt and switch_to_skas to the
top level _switch_to function, keeping us from duplicating code.  It is
required for the stack trace patch to work properly.

Signed-off-by: default avatarAllan Graves <allan.graves@gmail.com>
Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6add9f7f

arch/um/kernel/process_kern.c

+10 −2
Original line number Diff line number Diff line
@@ -113,8 +113,16 @@ void set_current(void *t) 


void *_switch_to(void *prev, void *next, void *last)

{

	return(CHOOSE_MODE(switch_to_tt(prev, next), 

			   switch_to_skas(prev, next)));

        struct task_struct *from = prev;

        struct task_struct *to= next;



        to->thread.prev_sched = from;

        set_current(to);



	CHOOSE_MODE_PROC(switch_to_tt, switch_to_skas, prev, next);



        return(current->thread.prev_sched);



}



void interrupt_end(void)

arch/um/kernel/skas/include/mode_kern-skas.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include "asm/ptrace.h"



extern void flush_thread_skas(void);

extern void *switch_to_skas(void *prev, void *next);

extern void switch_to_skas(void *prev, void *next);

extern void start_thread_skas(struct pt_regs *regs, unsigned long eip,

			      unsigned long esp);

extern int copy_thread_skas(int nr, unsigned long clone_flags,

arch/um/kernel/skas/process_kern.c

+1 −6
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include "proc_mm.h"

#include "registers.h"



void *switch_to_skas(void *prev, void *next)

void switch_to_skas(void *prev, void *next)

{

	struct task_struct *from, *to;
@@ -35,16 +35,11 @@ void *switch_to_skas(void *prev, void *next) 
	if(current->pid == 0)

		switch_timers(0);



	to->thread.prev_sched = from;

	set_current(to);



	switch_threads(&from->thread.mode.skas.switch_buf, 

		       to->thread.mode.skas.switch_buf);



	if(current->pid == 0)

		switch_timers(1);



	return(current->thread.prev_sched);

}



extern void schedule_tail(struct task_struct *prev);

arch/um/kernel/tt/include/mode_kern-tt.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include "asm/ptrace.h"

#include "asm/uaccess.h"



extern void *switch_to_tt(void *prev, void *next);

extern void switch_to_tt(void *prev, void *next);

extern void flush_thread_tt(void);

extern void start_thread_tt(struct pt_regs *regs, unsigned long eip,

			   unsigned long esp);

arch/um/kernel/tt/process_kern.c

+1 −6
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include "init.h"

#include "tt.h"



void *switch_to_tt(void *prev, void *next, void *last)

int switch_to_tt(void *prev, void *next, void *last)

{

	struct task_struct *from, *to, *prev_sched;

	unsigned long flags;
@@ -36,8 +36,6 @@ void *switch_to_tt(void *prev, void *next, void *last) 
	from = prev;

	to = next;



	to->thread.prev_sched = from;



	cpu = from->thread_info->cpu;

	if(cpu == 0)

		forward_interrupts(to->thread.mode.tt.extern_pid);
@@ -53,7 +51,6 @@ void *switch_to_tt(void *prev, void *next, void *last) 
	forward_pending_sigio(to->thread.mode.tt.extern_pid);



	c = 0;

	set_current(to);



	err = os_write_file(to->thread.mode.tt.switch_pipe[1], &c, sizeof(c));

	if(err != sizeof(c))
@@ -85,8 +82,6 @@ void *switch_to_tt(void *prev, void *next, void *last) 


	flush_tlb_all();

	local_irq_restore(flags);



	return(current->thread.prev_sched);

}



void release_thread_tt(struct task_struct *task)