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

Commit d944c4ee authored by Borislav Petkov's avatar Borislav Petkov Committed by Jiri Olsa
Browse files

tools: Consolidate types.h 



Combine all definitions into a common tools/include/linux/types.h and
kill the wild growth elsewhere. Move DECLARE_BITMAP to its proper
bitmap.h header.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Link: http://lkml.kernel.org/n/tip-azczs7qcv6h9xek9od10hiv2@git.kernel.org


Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
parent 5ac3e4b6

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/perf/MANIFEST

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ tools/include/asm/bug.h 
tools/include/linux/compiler.h

tools/include/linux/hash.h

tools/include/linux/export.h

tools/include/linux/types.h

include/linux/const.h

include/linux/perf_event.h

include/linux/rbtree.h

tools/perf/Makefile.perf

+1 −2
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ LIB_H += util/include/linux/poison.h 
LIB_H += util/include/linux/rbtree.h

LIB_H += util/include/linux/rbtree_augmented.h

LIB_H += util/include/linux/string.h

LIB_H += util/include/linux/types.h

LIB_H += ../include/linux/types.h

LIB_H += util/include/linux/linkage.h

LIB_H += util/include/asm/asm-offsets.h

LIB_H += ../include/asm/bug.h
@@ -252,7 +252,6 @@ LIB_H += util/event.h 
LIB_H += util/evsel.h

LIB_H += util/evlist.h

LIB_H += util/exec_cmd.h

LIB_H += util/types.h

LIB_H += util/levenshtein.h

LIB_H += util/machine.h

LIB_H += util/map.h

tools/perf/arch/x86/include/perf_regs.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#define ARCH_PERF_REGS_H



#include <stdlib.h>

#include "../../util/types.h"

#include <linux/types.h>

#include <asm/perf_regs.h>



void perf_regs_load(u64 *regs);

tools/perf/arch/x86/util/tsc.c

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#include <linux/perf_event.h>



#include "../../perf.h"

#include "../../util/types.h"

#include <linux/types.h>

#include "../../util/debug.h"

#include "tsc.h"