summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorArve Hjønnevåg <arve@android.com>2009-01-15 19:07:27 -0800
committerArve Hjønnevåg <arve@android.com>2010-02-08 15:35:53 -0800
commitafa82e25d4d6ab6500828cd7cc9d395a9c1e5d69 (patch)
tree295c48c964bab260852a9df36759150b5cf62583 /kernel
parentf9193a728ae53bf17792f3eebad07f89c2166c73 (diff)
Revert "printk: remove unused code from kernel/printk.c"
This reverts commit acff181d3574244e651913df77332e897b88bff4.
Diffstat (limited to 'kernel')
-rw-r--r--kernel/printk.c39
1 files changed, 39 insertions, 0 deletions
diff --git a/kernel/printk.c b/kernel/printk.c
index 0221437f1eab..448fdc68c8df 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -261,6 +261,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;
+}
+
+/*
* Commands to do_syslog:
*
* 0 -- Close the log. Currently a NOP.