summaryrefslogtreecommitdiff
path: root/kernel/printk.c
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2012-02-01 16:02:23 -0800
committerColin Cross <ccross@android.com>2012-04-09 13:57:48 -0700
commit609a71dba026f4fa2899951378abd07d3342e06e (patch)
tree02ff3dc9d7917ed3b90fbb8d6ae7cc9f2dce779e /kernel/printk.c
parentda8de7ae93a90cfbe38632522c465d784fca454d (diff)
printk: update log_buf_copy for 3.3
logbuf_lock is a raw spinlock in 3.3, replace spin_(un)lock_irq with raw_spin_(un)lock_irq. Change-Id: I4b13c6a34bcbcbe95ef28ac3aec0528deef7fa9d Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'kernel/printk.c')
-rw-r--r--kernel/printk.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/printk.c b/kernel/printk.c
index f1bb173f274..a4280499db0 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -322,7 +322,7 @@ int log_buf_copy(char *dest, int idx, int len)
bool took_lock = false;
if (!oops_in_progress) {
- spin_lock_irq(&logbuf_lock);
+ raw_spin_lock_irq(&logbuf_lock);
took_lock = true;
}
@@ -339,7 +339,7 @@ int log_buf_copy(char *dest, int idx, int len)
}
if (took_lock)
- spin_unlock_irq(&logbuf_lock);
+ raw_spin_unlock_irq(&logbuf_lock);
return ret;
}