diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-10-14 11:03:07 +0200 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-10-14 11:03:07 +0200 |
| commit | 8a229ae2d652b42437863787cfc28f7f8a78a35d (patch) | |
| tree | 9b3b8f31202f5ec2e3963e48d2cf7afd7a719ac8 /kernel | |
| parent | ac5ad2a19b7c3ffa766309c5ef3de0c79fa076c4 (diff) | |
| parent | 2e54c4fb47ffcc687457f9bcd9bba895f2a84963 (diff) | |
| download | kernel_samsung_crespo-8a229ae2d652b42437863787cfc28f7f8a78a35d.zip kernel_samsung_crespo-8a229ae2d652b42437863787cfc28f7f8a78a35d.tar.gz kernel_samsung_crespo-8a229ae2d652b42437863787cfc28f7f8a78a35d.tar.bz2 | |
Merge commit '2e54c4f' into HEAD
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sys.c | 1 | ||||
| -rw-r--r-- | kernel/workqueue.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index f88dadc..dd29555 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -334,6 +334,7 @@ void kernel_restart_prepare(char *cmd) void kernel_restart(char *cmd) { kernel_restart_prepare(cmd); + disable_nonboot_cpus(); if (!cmd) printk(KERN_EMERG "Restarting system.\n"); else diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 00c0bad..aef9452 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -1868,7 +1868,9 @@ __acquires(&gcwq->lock) spin_unlock_irq(&gcwq->lock); + smp_wmb(); /* paired with test_and_set_bit(PENDING) */ work_clear_pending(work); + lock_map_acquire_read(&cwq->wq->lockdep_map); lock_map_acquire(&lockdep_map); trace_workqueue_execute_start(work); |