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>2009-04-07 16:43:31 -0700
commitfca2519ebf25db61da132932eb3fffeaa1974f43 (patch)
treeb56e3a141963da1152491d933da8a42ae80cb81f /kernel
parent700cfcab7eee4a822be3fe0c8cfd77caac10bfed (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 e39866e0a5ab..bf4e7763c3c4 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -236,6 +236,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.