diff options
| author | Colin Cross <ccross@android.com> | 2011-01-07 17:20:53 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-01-07 17:20:53 -0800 |
| commit | 351516118103c6c7bb5321aa9d5866eb3dc0d5ca (patch) | |
| tree | bf8ecc55d77847ec8299bcf964352bef38121cc5 /kernel/printk.c | |
| parent | c37bff78783d40d6e604129135c207e279de902f (diff) | |
| parent | bd842b53fada517017d192c8a12fc9a38e6250e1 (diff) | |
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Conflicts:
arch/arm/mm/cache-v6.S
Change-Id: I1a2063218dd705a762a40f4a9dfe504ce1a1d491
Diffstat (limited to 'kernel/printk.c')
| -rw-r--r-- | kernel/printk.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 48ce53f5bb0a..8d41a50af0db 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -1131,13 +1131,15 @@ void printk_tick(void) int printk_needs_cpu(int cpu) { + if (unlikely(cpu_is_offline(cpu))) + printk_tick(); return per_cpu(printk_pending, cpu); } void wake_up_klogd(void) { if (waitqueue_active(&log_wait)) - __raw_get_cpu_var(printk_pending) = 1; + this_cpu_write(printk_pending, 1); } /** |