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

Commit 802da5f2 authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar
Browse files

perf tools: Drop asm/types.h wrapper 



Wrapping the kernel headers is dangerous when it comes to arch
headers. Once we wrap asm/types.h, it will also replace the
glibc asm/types.h, not only the kernel one.

This results in build errors on some machines.

Drop this wrapper and do its work from linux/types.h wrapper,
also the glibc asm/types.h can already handle most of the type
definition it was doing (typedef __u64, __u32, etc...).

Todo: Check the others asm/*.h wrappers to prevent from other
conflicts.

Reported-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Anton Blanchard <anton@samba.org>
LKML-Reference: <1256246604-17156-3-git-send-email-fweisbec@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a4fb581b

tools/perf/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -352,7 +352,6 @@ LIB_H += util/include/asm/bitops.h 
LIB_H += util/include/asm/byteorder.h

LIB_H += util/include/asm/byteorder.h

LIB_H += util/include/asm/swab.h

LIB_H += util/include/asm/swab.h

LIB_H += util/include/asm/system.h

LIB_H += util/include/asm/system.h

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

LIB_H += util/include/asm/uaccess.h

LIB_H += util/include/asm/uaccess.h

LIB_H += perf.h

LIB_H += perf.h

LIB_H += util/event.h

LIB_H += util/event.h

tools/perf/util/include/asm/bitops.h

+12 −0
Original line number Original line Diff line number Diff line 
#ifndef _PERF_ASM_BITOPS_H_

#define _PERF_ASM_BITOPS_H_



#include <sys/types.h>

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

#include <linux/compiler.h>



/* CHECKME: Not sure both always match */

#define BITS_PER_LONG	__WORDSIZE



#include "../../../../include/asm-generic/bitops/__fls.h"

#include "../../../../include/asm-generic/bitops/__fls.h"

#include "../../../../include/asm-generic/bitops/fls.h"

#include "../../../../include/asm-generic/bitops/fls.h"

#include "../../../../include/asm-generic/bitops/fls64.h"

#include "../../../../include/asm-generic/bitops/fls64.h"

#include "../../../../include/asm-generic/bitops/__ffs.h"

#include "../../../../include/asm-generic/bitops/__ffs.h"

#include "../../../../include/asm-generic/bitops/ffz.h"

#include "../../../../include/asm-generic/bitops/ffz.h"

#include "../../../../include/asm-generic/bitops/hweight.h"

#include "../../../../include/asm-generic/bitops/hweight.h"



#endif

tools/perf/util/include/asm/byteorder.h

+1 −1
Original line number Original line Diff line number Diff line 
#include "../asm/types.h"

#include <asm/types.h>

#include "../../../../include/linux/swab.h"
 
#include "../../../../include/linux/swab.h"

tools/perf/util/include/asm/types.h

deleted100644 → 0
+0 −17
Original line number Original line Diff line number Diff line 
#ifndef PERF_ASM_TYPES_H_

#define PERF_ASM_TYPES_H_



#include <linux/compiler.h>

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

#include <sys/types.h>



/* CHECKME: Not sure both always match */

#define BITS_PER_LONG	__WORDSIZE



typedef u64	__u64;

typedef u32	__u32;

typedef u16	__u16;

typedef u8	__u8;

typedef s64	__s64;



#endif /* PERF_ASM_TYPES_H_ */

tools/perf/util/include/linux/types.h

+2 −0
Original line number Original line Diff line number Diff line 
#ifndef _PERF_LINUX_TYPES_H_

#ifndef _PERF_LINUX_TYPES_H_

#define _PERF_LINUX_TYPES_H_

#define _PERF_LINUX_TYPES_H_





#include <asm/types.h>



#define DECLARE_BITMAP(name,bits) \

#define DECLARE_BITMAP(name,bits) \

	unsigned long name[BITS_TO_LONGS(bits)]

	unsigned long name[BITS_TO_LONGS(bits)]