Merge branch 'core/urgent' into sched/core

Merge in asm goto fix, to be able to apply the asm/rmwcc.h fix.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --combined init/main.c
index 7cc4b7889a88fad4ae8e6b1b5426024d253e5dfa,63d3e8f2970c1377ec822bcb9db8ee306faecee6..379090fadac9a1652aa9f095db2bf6ef49ddc763
--- 1/init/main.c
--- 2/init/main.c
+++ b/init/main.c
@@@ -76,6 -76,7 +76,7 @@@
  #include <linux/elevator.h>
  #include <linux/sched_clock.h>
  #include <linux/context_tracking.h>
+ #include <linux/random.h>
  
  #include <asm/io.h>
  #include <asm/bugs.h>
@@@ -692,7 -693,7 +693,7 @@@ int __init_or_module do_one_initcall(in
  
        if (preempt_count() != count) {
                sprintf(msgbuf, "preemption imbalance ");
 -              preempt_count() = count;
 +              preempt_count_set(count);
        }
        if (irqs_disabled()) {
                strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
@@@ -780,6 -781,7 +781,7 @@@ static void __init do_basic_setup(void
        do_ctors();
        usermodehelper_enable();
        do_initcalls();
+       random_int_secret_init();
  }
  
  static void __init do_pre_smp_initcalls(void)