summaryrefslogtreecommitdiff
path: root/kernel/printk.c
diff options
context:
space:
mode:
authorArve Hjønnevåg <arve@android.com>2009-01-15 19:07:27 -0800
committerColin Cross <ccross@android.com>2012-04-09 13:57:47 -0700
commit572b262cd341fb0b112ca9482910d53593c1e0e5 (patch)
treea815b6d4f92a77ea39e20d94c002128e5e2cb9c8 /kernel/printk.c
parentc543f112f11bd08d5efdf8815ff419bd20a7a392 (diff)
Revert "printk: remove unused code from kernel/printk.c"
This reverts commit acff181d3574244e651913df77332e897b88bff4.
Diffstat (limited to 'kernel/printk.c')
-rw-r--r--kernel/printk.c39
1 files changed, 39 insertions, 0 deletions
diff --git a/kernel/printk.c b/kernel/printk.c
index e12d00dc822..5841d34101e 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -297,6 +297,45 @@ static inline void boot_delay_msec(void)
}
#endif
+/*
+ * Return the number of unread characters in the log buffer.
+ */
+static int log_buf_get_len(void)
+{
+ return logged_chars;
+}
+
+/*
+ * Copy a range of characters from the log buffer.
+ */
+int log_buf_copy(char *dest, int idx, int len)
+{
+ int ret, max;
+ bool took_lock = false;
+
+ if (!oops_in_progress) {
+ spin_lock_irq(&logbuf_lock);
+ took_lock = true;
+ }
+
+ max = log_buf_get_len();
+ if (idx < 0 || idx >= max) {
+ ret = -1;
+ } else {
+ if (len > max)
+ len = max;
+ ret = len;
+ idx += (log_end - max);
+ while (len-- > 0)
+ dest[len] = LOG_BUF(idx + len);
+ }
+
+ if (took_lock)
+ spin_unlock_irq(&logbuf_lock);
+
+ return ret;
+}
+
#ifdef CONFIG_SECURITY_DMESG_RESTRICT
int dmesg_restrict = 1;
#else