projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[sky2] Fix sky2 network driver suspend/resume
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
printk.c
diff --git
a/kernel/printk.c
b/kernel/printk.c
index 8cc19431e74ba1d5c52095e7c0f97c56f6018734..c056f3324432c31152063de1ca820fbcd2f3d92a 100644
(file)
--- a/
kernel/printk.c
+++ b/
kernel/printk.c
@@
-360,8
+360,7
@@
static void call_console_drivers(unsigned long start, unsigned long end)
unsigned long cur_index, start_print;
static int msg_level = -1;
unsigned long cur_index, start_print;
static int msg_level = -1;
- if (((long)(start - end)) > 0)
- BUG();
+ BUG_ON(((long)(start - end)) > 0);
cur_index = start;
start_print = start;
cur_index = start;
start_print = start;
@@
-708,8
+707,7
@@
int __init add_preferred_console(char *name, int idx, char *options)
*/
void acquire_console_sem(void)
{
*/
void acquire_console_sem(void)
{
- if (in_interrupt())
- BUG();
+ BUG_ON(in_interrupt());
down(&console_sem);
console_locked = 1;
console_may_schedule = 1;
down(&console_sem);
console_locked = 1;
console_may_schedule = 1;