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>

1 files changed, 2 insertions, 0 deletions

diff --git a/kernel/panic.c b/kernel/panic.c
index 3a0b0898690a..33cab3de1763 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -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;
 }