diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-05-27 22:58:20 +0200 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-05-27 22:58:20 +0200 |
| commit | d85d135d8babbc917b370f36cbc02b7b4a2f2d99 (patch) | |
| tree | 2f06e02940d87099670aa31459ad1ab41a1ca036 /arch/um/kernel/process.c | |
| parent | drivers/video: fsl-diu-fb: don't initialize the THRESHOLDS registers (diff) | |
| parent | OMAPDSS: HDMI: OMAP4: Update IRQ flags for the HPD IRQ request (diff) | |
| download | linux-d85d135d8babbc917b370f36cbc02b7b4a2f2d99.tar.xz linux-d85d135d8babbc917b370f36cbc02b7b4a2f2d99.zip | |
Merge tag 'omapdss-for-3.5' of git://github.com/tomba/linux into fbdev-next
Omapdss driver changes for 3.5 merge window.
Lots of normal development commits, but perhaps most notable changes are:
* HDMI rework to properly decouple the HDMI audio part from the HDMI video part.
* Restructure omapdss core driver so that it's possible to implement device
tree support. This included changing how platform data is passed to the
drivers, changing display device registration and improving the panel driver's
ability to configure the underlying video output interface.
* Basic support for DSI packet interleaving
Diffstat (limited to 'arch/um/kernel/process.c')
| -rw-r--r-- | arch/um/kernel/process.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index f386d04a84a5..2b73dedb44ca 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c @@ -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); @@ -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) |