Merge branches 'perf-fixes-for-linus' and 'x86-fixes-for-linus' of git://git.kernel...

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  jump label: Add work around to i386 gcc asm goto bug
  x86, ftrace: Use safe noops, drop trap test
  jump_label: Fix unaligned traps on sparc.
  jump label: Make arch_jump_label_text_poke_early() optional
  jump label: Fix error with preempt disable holding mutex
  oprofile: Remove deprecated use of flush_scheduled_work()
  oprofile: Fix the hang while taking the cpu offline
  jump label: Fix deadlock b/w jump_label_mutex vs. text_mutex
  jump label: Fix module __init section race

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Check irq_remapped instead of remapping_enabled in destroy_irq()

diff --combined arch/sparc/include/asm/jump_label.h
index 65c0d3029796e0d09a06939f9f3cb19b2deef8bc,d95cf44fb40d9f7b01d1131c486990018cfec952,65c0d3029796e0d09a06939f9f3cb19b2deef8bc..427d4684e0d239bbafe9238a01a2713e423ff9b7
--- 1/arch/sparc/include/asm/jump_label.h
--- 2/arch/sparc/include/asm/jump_label.h
--- 3/arch/sparc/include/asm/jump_label.h
+++ b/arch/sparc/include/asm/jump_label.h
@@@@ -4,6 -4,7 -4,6 +4,6 @@@@
   #ifdef __KERNEL__
   
   #include <linux/types.h>
 - #include <asm/system.h>
   
   #define JUMP_LABEL_NOP_SIZE 4
   
@@@@ -13,6 -14,7 -13,6 +13,7 @@@@
                         "nop\n\t"                              \
                         "nop\n\t"                              \
                         ".pushsection __jump_table,  \"a\"\n\t"\
+ +                      ".align 4\n\t"                         \
                         ".word 1b, %l[" #label "], %c0\n\t"    \
                         ".popsection \n\t"                     \
                         : :  "i" (key) :  : label);\

diff --combined arch/x86/kernel/alternative.c
index 5ceeca382820c279c539a453b775fd1e16a2f386,0b30214282a8ddbfa9f98fa4a295bc9e2fb8a450,5ceeca382820c279c539a453b775fd1e16a2f386..5079f24c955a2d3b9b66532cd2c8cd45e5116d14
--- 1/arch/x86/kernel/alternative.c
--- 2/arch/x86/kernel/alternative.c
--- 3/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@@@ -638,71 -638,32 -638,71 +638,32 @@@@ void *__kprobes text_poke_smp(void *add
        atomic_set(&stop_machine_first, 1);
        wrote_text = 0;
        /* Use __stop_machine() because the caller already got online_cpus. */
 -      __stop_machine(stop_machine_text_poke, (void *)&tpp, NULL);
 +      __stop_machine(stop_machine_text_poke, (void *)&tpp, cpu_online_mask);
        return addr;
   }
   
   #if defined(CONFIG_DYNAMIC_FTRACE) || defined(HAVE_JUMP_LABEL)
   
- -unsigned char ideal_nop5[IDEAL_NOP_SIZE_5];
+ +#ifdef CONFIG_X86_64
+ +unsigned char ideal_nop5[5] = { 0x66, 0x66, 0x66, 0x66, 0x90 };
+ +#else
+ +unsigned char ideal_nop5[5] = { 0x3e, 0x8d, 0x74, 0x26, 0x00 };
+ +#endif
   
   void __init arch_init_ideal_nop5(void)
   {
- -     extern const unsigned char ftrace_test_p6nop[];
- -     extern const unsigned char ftrace_test_nop5[];
- -     extern const unsigned char ftrace_test_jmp[];
- -     int faulted = 0;
- -
        /*
- -      * There is no good nop for all x86 archs.
- -      * We will default to using the P6_NOP5, but first we
- -      * will test to make sure that the nop will actually
- -      * work on this CPU. If it faults, we will then
- -      * go to a lesser efficient 5 byte nop. If that fails
- -      * we then just use a jmp as our nop. This isn't the most
- -      * efficient nop, but we can not use a multi part nop
- -      * since we would then risk being preempted in the middle
- -      * of that nop, and if we enabled tracing then, it might
- -      * cause a system crash.
+ +      * There is no good nop for all x86 archs.  This selection
+ +      * algorithm should be unified with the one in find_nop_table(),
+ +      * but this should be good enough for now.
         *
- -      * TODO: check the cpuid to determine the best nop.
+ +      * For cases other than the ones below, use the safe (as in
+ +      * always functional) defaults above.
         */
- -     asm volatile (
- -             "ftrace_test_jmp:"
- -             "jmp ftrace_test_p6nop\n"
- -             "nop\n"
- -             "nop\n"
- -             "nop\n"  /* 2 byte jmp + 3 bytes */
- -             "ftrace_test_p6nop:"
- -             P6_NOP5
- -             "jmp 1f\n"
- -             "ftrace_test_nop5:"
- -             ".byte 0x66,0x66,0x66,0x66,0x90\n"
- -             "1:"
- -             ".section .fixup, \"ax\"\n"
- -             "2:     movl $1, %0\n"
- -             "       jmp ftrace_test_nop5\n"
- -             "3:     movl $2, %0\n"
- -             "       jmp 1b\n"
- -             ".previous\n"
- -             _ASM_EXTABLE(ftrace_test_p6nop, 2b)
- -             _ASM_EXTABLE(ftrace_test_nop5, 3b)
- -             : "=r"(faulted) : "0" (faulted));
- -
- -     switch (faulted) {
- -     case 0:
- -             pr_info("converting mcount calls to 0f 1f 44 00 00\n");
- -             memcpy(ideal_nop5, ftrace_test_p6nop, IDEAL_NOP_SIZE_5);
- -             break;
- -     case 1:
- -             pr_info("converting mcount calls to 66 66 66 66 90\n");
- -             memcpy(ideal_nop5, ftrace_test_nop5, IDEAL_NOP_SIZE_5);
- -             break;
- -     case 2:
- -             pr_info("converting mcount calls to jmp . + 5\n");
- -             memcpy(ideal_nop5, ftrace_test_jmp, IDEAL_NOP_SIZE_5);
- -             break;
- -     }
- -
+ +#ifdef CONFIG_X86_64
+ +     /* Don't use these on 32 bits due to broken virtualizers */
+ +     if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)
+ +             memcpy(ideal_nop5, p6_nops[5], 5);
+ +#endif
   }
   #endif