diff options
| author | Colin Cross <ccross@android.com> | 2011-06-17 15:52:43 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-17 15:52:43 -0700 |
| commit | 40aa73fa7ba6f10c44e49672c9570a2dfd7fe347 (patch) | |
| tree | 12a108bfcea32621dc3580cb36bddde08e8e109a /kernel | |
| parent | d951417ad2c1d2c17a2cb7c308ea84ff29d62333 (diff) | |
| parent | 763f2ae41841df60fa4cc651b874cbc9429046cf (diff) | |
Merge branch 'android-2.6.39' into android-tegra-2.6.39
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/printk.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 8726382c78d1..acf20f50fa89 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -1172,7 +1172,6 @@ static int __cpuinit console_cpu_notify(struct notifier_block *self, switch (action) { case CPU_ONLINE: case CPU_DEAD: - case CPU_DYING: case CPU_DOWN_FAILED: case CPU_UP_CANCELED: console_lock(); |