Skip to content

Commit

Permalink
um: Use asm-generic/switch_to.h
Browse files Browse the repository at this point in the history
Signed-off-by: Richard Weinberger <richard@nod.at>
  • Loading branch information
Richard Weinberger committed Apr 9, 2012
1 parent a3a85a7 commit 76b278e
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 12 deletions.
1 change: 1 addition & 0 deletions arch/um/include/asm/Kbuild
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
generic-y += bug.h cputime.h device.h emergency-restart.h futex.h hardirq.h
generic-y += hw_irq.h irq_regs.h kdebug.h percpu.h sections.h topology.h xor.h
generic-y += ftrace.h pci.h io.h param.h delay.h mutex.h current.h exec.h
generic-y += switch_to.h
6 changes: 1 addition & 5 deletions arch/um/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,8 @@ static inline void set_current(struct task_struct *task)

extern void arch_switch_to(struct task_struct *to);

void *_switch_to(void *prev, void *next, void *last)
void *__switch_to(struct task_struct *from, struct task_struct *to)
{
struct task_struct *from = prev;
struct task_struct *to = next;

to->thread.prev_sched = from;
set_current(to);

Expand All @@ -111,7 +108,6 @@ void *_switch_to(void *prev, void *next, void *last)
} while (current->thread.saved_task);

return current->thread.prev_sched;

}

void interrupt_end(void)
Expand Down
7 changes: 0 additions & 7 deletions arch/x86/um/asm/switch_to.h

This file was deleted.

0 comments on commit 76b278e

Please sign in to comment.