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

Commit 3e46d212 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo' of... 

Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf

 into perf/core

Pull perf/core improvements and fixes from Jiri Olsa:

  * Cleanups for perf.h header (Jiri Olsa)

  * Consolidate types.h and export.h within tools (Borislav Petkov)

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 3617660e 73a31b7c

tools/include/linux/compiler.h

+2 −0
Original line number Diff line number Diff line
@@ -35,4 +35,6 @@ 
# define unlikely(x)		__builtin_expect(!!(x), 0)

#endif



#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))



#endif /* _TOOLS_LINUX_COMPILER_H */

tools/virtio/linux/export.h→tools/include/linux/export.h

+5 −0
Original line number Diff line number Diff line 
#ifndef _TOOLS_LINUX_EXPORT_H_

#define _TOOLS_LINUX_EXPORT_H_



#define EXPORT_SYMBOL(sym)

#define EXPORT_SYMBOL_GPL(sym)

#define EXPORT_SYMBOL_GPL_FUTURE(sym)

#define EXPORT_UNUSED_SYMBOL(sym)

#define EXPORT_UNUSED_SYMBOL_GPL(sym)



#endif

tools/lib/lockdep/uinclude/linux/types.h→tools/include/linux/types.h

+23 −6
Original line number Diff line number Diff line 
#ifndef _LIBLOCKDEP_LINUX_TYPES_H_

#define _LIBLOCKDEP_LINUX_TYPES_H_

#ifndef _TOOLS_LINUX_TYPES_H_

#define _TOOLS_LINUX_TYPES_H_



#include <stdbool.h>

#include <stddef.h>

#include <stdint.h>



#define __SANE_USERSPACE_TYPES__	/* For PPC64, to get LL64 types */

#include <asm/types.h>
@@ -10,10 +11,22 @@ 
struct page;

struct kmem_cache;



typedef unsigned gfp_t;

typedef enum {

	GFP_KERNEL,

	GFP_ATOMIC,

	__GFP_HIGHMEM,

	__GFP_HIGH

} gfp_t;



typedef __u64 u64;

typedef __s64 s64;

/*

 * We define u64 as uint64_t for every architecture

 * so that we can print it with "%"PRIx64 without getting warnings.

 *

 * typedef __u64 u64;

 * typedef __s64 s64;

 */

typedef uint64_t u64;

typedef int64_t s64;



typedef __u32 u32;

typedef __s32 s32;
@@ -35,6 +48,10 @@ typedef __s8 s8; 
#define __bitwise

#endif



#define __force

#define __user

#define __must_check

#define __cold



typedef __u16 __bitwise __le16;

typedef __u16 __bitwise __be16;
@@ -55,4 +72,4 @@ struct hlist_node { 
	struct hlist_node *next, **pprev;

};



#endif
 
#endif /* _TOOLS_LINUX_TYPES_H_ */

tools/lib/lockdep/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ N = 


export Q VERBOSE



INCLUDES = -I. -I/usr/local/include -I./uinclude -I./include $(CONFIG_INCLUDES)

INCLUDES = -I. -I/usr/local/include -I./uinclude -I./include -I../../include $(CONFIG_INCLUDES)



# Set compile option CFLAGS if not set elsewhere

CFLAGS ?= -g -DCONFIG_LOCKDEP -DCONFIG_STACKTRACE -DCONFIG_PROVE_LOCKING -DBITS_PER_LONG=__WORDSIZE -DLIBLOCKDEP_VERSION='"$(LIBLOCKDEP_VERSION)"' -rdynamic -O0 -g

tools/lib/lockdep/uinclude/linux/export.h

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
#ifndef _LIBLOCKDEP_LINUX_EXPORT_H_

#define _LIBLOCKDEP_LINUX_EXPORT_H_



#define EXPORT_SYMBOL(sym)

#define EXPORT_SYMBOL_GPL(sym)



#endif