diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/wakelock.c | 8 | ||||
| -rw-r--r-- | kernel/printk.c | 16 |
2 files changed, 11 insertions, 13 deletions
diff --git a/kernel/power/wakelock.c b/kernel/power/wakelock.c index ee83a3c5047..4fd55503e00 100644 --- a/kernel/power/wakelock.c +++ b/kernel/power/wakelock.c @@ -18,8 +18,11 @@ #include <linux/rbtree.h> #include <linux/slab.h> +#define BAD_WAKELOCK "bluetooth_timer" + static DEFINE_MUTEX(wakelocks_lock); + struct wakelock { char *name; struct rb_node node; @@ -194,6 +197,11 @@ int pm_wake_lock(const char *buf) printk ("OLIO %s error return 1, lock %s\n", __FUNCTION__, buf); return -EPERM; } +#elif 1 /* OLIO The bluetooth stack abuses this wake lock, so don't allow it to lock */ + if (strncmp(buf, BAD_WAKELOCK, strlen(BAD_WAKELOCK)) == 0) { + printk ("OLIO %s error return 1, lock %s\n", __FUNCTION__, buf); + return -EPERM; + } #endif while (*str && !isspace(*str)) diff --git a/kernel/printk.c b/kernel/printk.c index c247ad5df09..1b76b38986b 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -60,7 +60,7 @@ extern void printascii(char *); /* We show everything that is MORE important than this.. */ #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ -#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ +#define DEFAULT_CONSOLE_LOGLEVEL 1 /* anything MORE serious than KERN_DEBUG */ int console_printk[4] = { DEFAULT_CONSOLE_LOGLEVEL, /* console_loglevel */ @@ -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; |