• Linus Torvalds's avatar
    Merge branch 'perf-fixes-for-linus' of... · 2205afa7
    Linus Torvalds authored
    Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      perf sched: Fix build failure on sparc
      perf bench: Add "all" pseudo subsystem and "all" pseudo suite
      perf tools: Introduce perf_session class
      perf symbols: Ditch dso->find_symbol
      perf symbols: Allow lookups by symbol name too
      perf symbols: Add missing "Variables" entry to map_type__name
      perf symbols: Add support for 'variable' symtabs
      perf symbols: Introduce ELF counterparts to symbol_type__is_a
      perf symbols: Introduce symbol_type__is_a
      perf symbols: Rename kthreads to kmaps, using another abstraction for it
      perf tools: Allow building for ARM
      hw-breakpoints: Handle bad modify_user_hw_breakpoint off-case return value
      perf tools: Allow cross compiling
      tracing, slab: Fix no callsite ifndef CONFIG_KMEMTRACE
      tracing, slab: Define kmem_cache_alloc_notrace ifdef CONFIG_TRACING
    
    Trivial conflict due to different fixes to modify_user_hw_breakpoint()
    in include/linux/hw_breakpoint.h
    2205afa7
slab.c 117 KB