Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2205afa7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-fixes-for-linus' of... 

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
parents 491424c0 2cd9046c

include/linux/hw_breakpoint.h

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ register_user_hw_breakpoint(struct perf_event_attr *attr, 
			    struct task_struct *tsk)	{ return NULL; }

static inline int

modify_user_hw_breakpoint(struct perf_event *bp,

			  struct perf_event_attr *attr)	{ return 0; }

			  struct perf_event_attr *attr)	{ return -ENOSYS; }

static inline struct perf_event *

register_wide_hw_breakpoint_cpu(struct perf_event_attr *attr,

				perf_overflow_handler_t	 triggered,

include/linux/slab_def.h

+2 −2
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ extern struct cache_sizes malloc_sizes[]; 
void *kmem_cache_alloc(struct kmem_cache *, gfp_t);

void *__kmalloc(size_t size, gfp_t flags);



#ifdef CONFIG_KMEMTRACE

#ifdef CONFIG_TRACING

extern void *kmem_cache_alloc_notrace(struct kmem_cache *cachep, gfp_t flags);

extern size_t slab_buffer_size(struct kmem_cache *cachep);

#else
@@ -166,7 +166,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags) 
extern void *__kmalloc_node(size_t size, gfp_t flags, int node);

extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);



#ifdef CONFIG_KMEMTRACE

#ifdef CONFIG_TRACING

extern void *kmem_cache_alloc_node_notrace(struct kmem_cache *cachep,

					   gfp_t flags,

					   int nodeid);

include/linux/slub_def.h

+2 −2
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static __always_inline struct kmem_cache *kmalloc_slab(size_t size) 
void *kmem_cache_alloc(struct kmem_cache *, gfp_t);

void *__kmalloc(size_t size, gfp_t flags);



#ifdef CONFIG_KMEMTRACE

#ifdef CONFIG_TRACING

extern void *kmem_cache_alloc_notrace(struct kmem_cache *s, gfp_t gfpflags);

#else

static __always_inline void *
@@ -266,7 +266,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags) 
void *__kmalloc_node(size_t size, gfp_t flags, int node);

void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);



#ifdef CONFIG_KMEMTRACE

#ifdef CONFIG_TRACING

extern void *kmem_cache_alloc_node_notrace(struct kmem_cache *s,

					   gfp_t gfpflags,

					   int node);

mm/slab.c

+6 −6
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ static void **dbg_userword(struct kmem_cache *cachep, void *objp) 


#endif



#ifdef CONFIG_KMEMTRACE

#ifdef CONFIG_TRACING

size_t slab_buffer_size(struct kmem_cache *cachep)

{

	return cachep->buffer_size;
@@ -3578,7 +3578,7 @@ void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags) 
}

EXPORT_SYMBOL(kmem_cache_alloc);



#ifdef CONFIG_KMEMTRACE

#ifdef CONFIG_TRACING

void *kmem_cache_alloc_notrace(struct kmem_cache *cachep, gfp_t flags)

{

	return __cache_alloc(cachep, flags, __builtin_return_address(0));
@@ -3641,7 +3641,7 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid) 
}

EXPORT_SYMBOL(kmem_cache_alloc_node);



#ifdef CONFIG_KMEMTRACE

#ifdef CONFIG_TRACING

void *kmem_cache_alloc_node_notrace(struct kmem_cache *cachep,

				    gfp_t flags,

				    int nodeid)
@@ -3669,7 +3669,7 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, void *caller) 
	return ret;

}



#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_KMEMTRACE)

#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING)

void *__kmalloc_node(size_t size, gfp_t flags, int node)

{

	return __do_kmalloc_node(size, flags, node,
@@ -3689,7 +3689,7 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node) 
	return __do_kmalloc_node(size, flags, node, NULL);

}

EXPORT_SYMBOL(__kmalloc_node);

#endif /* CONFIG_DEBUG_SLAB */

#endif /* CONFIG_DEBUG_SLAB || CONFIG_TRACING */

#endif /* CONFIG_NUMA */



/**
@@ -3721,7 +3721,7 @@ static __always_inline void *__do_kmalloc(size_t size, gfp_t flags, 
}





#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_KMEMTRACE)

#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING)

void *__kmalloc(size_t size, gfp_t flags)

{

	return __do_kmalloc(size, flags, __builtin_return_address(0));

mm/slub.c

+2 −2
Original line number Diff line number Diff line
@@ -1754,7 +1754,7 @@ void *kmem_cache_alloc(struct kmem_cache *s, gfp_t gfpflags) 
}

EXPORT_SYMBOL(kmem_cache_alloc);



#ifdef CONFIG_KMEMTRACE

#ifdef CONFIG_TRACING

void *kmem_cache_alloc_notrace(struct kmem_cache *s, gfp_t gfpflags)

{

	return slab_alloc(s, gfpflags, -1, _RET_IP_);
@@ -1775,7 +1775,7 @@ void *kmem_cache_alloc_node(struct kmem_cache *s, gfp_t gfpflags, int node) 
EXPORT_SYMBOL(kmem_cache_alloc_node);

#endif



#ifdef CONFIG_KMEMTRACE

#ifdef CONFIG_TRACING

void *kmem_cache_alloc_node_notrace(struct kmem_cache *s,

				    gfp_t gfpflags,

				    int node)