mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branch 'linus' into x86/core
Conflicts: arch/x86/mm/ioremap.c Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
commit
ae94b8075a
62 changed files with 1812 additions and 190 deletions
|
|
@ -670,7 +670,7 @@ static int acquire_console_semaphore_for_printk(unsigned int cpu)
|
|||
return retval;
|
||||
}
|
||||
|
||||
const char printk_recursion_bug_msg [] =
|
||||
static const char printk_recursion_bug_msg [] =
|
||||
KERN_CRIT "BUG: recent printk recursion!\n";
|
||||
static int printk_recursion_bug;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue