tracing: move scripts/trace/power.pl to scripts/tracing/power.pl

[safe/jmp/linux-2.6] / kernel / panic.c

diff --git a/kernel/panic.c b/kernel/panic.c
index 3a0b089..32fe4ef 100644 (file)
--- 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;
 }
@@ -357,10 +359,6 @@ EXPORT_SYMBOL(warn_slowpath);
 
 #ifdef CONFIG_CC_STACKPROTECTOR
 
-#ifndef GCC_HAS_SP
-#warning You have selected the CONFIG_CC_STACKPROTECTOR option, but the gcc used does not support this.
-#endif
-
 /*
  * Called when gcc's -fstack-protector feature is used, and
  * gcc detects corruption of the on-stack canary value