Merge branch 'core/percpu' into stackprotector
Conflicts: arch/x86/include/asm/pda.h arch/x86/include/asm/system.h Also, moved include/asm-x86/stackprotector.h to arch/x86/include/asm. Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
@@ -302,6 +302,8 @@ static int init_oops_id(void)
|
||||
{
|
||||
if (!oops_id)
|
||||
get_random_bytes(&oops_id, sizeof(oops_id));
|
||||
else
|
||||
oops_id++;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user