diff options
| author | Evan Wilson <evan@oliodevices.com> | 2016-01-29 14:46:35 -0800 |
|---|---|---|
| committer | Evan Wilson <evan@oliodevices.com> | 2016-01-29 14:46:35 -0800 |
| commit | a132a9028956b6f8668cefbfe65a47579f79a685 (patch) | |
| tree | 90c0d33cf9aae171e579b86e246be1ee15a76c0c | |
| parent | 6e3548490c09c2abe1cf246a2f6569457d1930fe (diff) | |
| download | olio-linux-3.10-a132a9028956b6f8668cefbfe65a47579f79a685.tar.xz olio-linux-3.10-a132a9028956b6f8668cefbfe65a47579f79a685.zip | |
Revert "Patch to use local_clock for kernel messages"
This reverts commit 76b2d51f406aebaac61329a7f0831ee69ea6d7a0.
| -rw-r--r-- | kernel/printk.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index c247ad5df09..bf785e0ce73 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -258,17 +258,7 @@ static u32 clear_idx; static char __log_buf[__LOG_BUF_LEN] __aligned(LOG_ALIGN); static char *log_buf = __log_buf; static u32 log_buf_len = __LOG_BUF_LEN; -static u64 print_clock(void) -{ - struct timespec ts; - u64 ts_nsec = local_clock(); - - ts = ns_to_timespec(ts_nsec); - monotonic_to_bootbased(&ts); - ts_nsec = timespec_to_ns(&ts); - return ts_nsec; -} /* cpu currently holding logbuf_lock */ static volatile unsigned int logbuf_cpu = UINT_MAX; @@ -368,7 +358,7 @@ static void log_store(int facility, int level, if (ts_nsec > 0) msg->ts_nsec = ts_nsec; else - msg->ts_nsec = print_clock(); //local_clock(); + msg->ts_nsec = local_clock(); memset(log_dict(msg) + dict_len, 0, pad_len); msg->len = sizeof(struct log) + text_len + dict_len + pad_len; @@ -1464,7 +1454,7 @@ static bool cont_add(int facility, int level, const char *text, size_t len) cont.facility = facility; cont.level = level; cont.owner = current; - cont.ts_nsec = print_clock(); //local_clock(); + cont.ts_nsec = local_clock(); cont.flags = 0; cont.cons = 0; cont.flushed = false; |