diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-19 14:17:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-19 14:17:30 -0400 |
| commit | abaa72d7fd9a20a67b62e6afa0e746e27851dc33 (patch) | |
| tree | ebe4134fcc93a6e205e6004b3e652d7a62281651 /arch/um/drivers | |
| parent | 67da22d23fa6f3324e03bcd0580b914b2e4afbf3 (diff) | |
| parent | 3e4b9459fb0e149c6b74c9e89399a8fc39a92b44 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Diffstat (limited to 'arch/um/drivers')
| -rw-r--r-- | arch/um/drivers/mconsole_kern.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c index 88e466b159dc..43b39d61b538 100644 --- a/arch/um/drivers/mconsole_kern.c +++ b/arch/um/drivers/mconsole_kern.c | |||
| @@ -705,7 +705,6 @@ static void stack_proc(void *arg) | |||
| 705 | struct task_struct *from = current, *to = arg; | 705 | struct task_struct *from = current, *to = arg; |
| 706 | 706 | ||
| 707 | to->thread.saved_task = from; | 707 | to->thread.saved_task = from; |
| 708 | rcu_switch_from(from); | ||
| 709 | switch_to(from, to, from); | 708 | switch_to(from, to, from); |
| 710 | } | 709 | } |
| 711 | 710 | ||