diff options
author | Arve Hjønnevåg <arve@android.com> | 2009-01-15 19:07:27 -0800 |
---|---|---|
committer | Brian Swetland <swetland@google.com> | 2011-03-29 13:57:49 -0700 |
commit | 05120dcc3e6bcdf182360de158c0427395d8d42f (patch) | |
tree | 1679a828fa95f361b10b678412a375f54b3a97a2 /kernel | |
parent | 16d02ade7e25271f257f28dab7597ac45f8bbbf2 (diff) |
Revert "printk: remove unused code from kernel/printk.c"
This reverts commit acff181d3574244e651913df77332e897b88bff4.
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/printk.c | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 53b48047b3b3..82238c9da259 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -260,6 +260,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 |