lkml.org 
[lkml]   [2009]   [Oct]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:branch?] perf tools: Drop asm/types.h wrapper
    Commit-ID:  802da5f2289bbe363acef084805195c11f453c48
    Gitweb: http://git.kernel.org/tip/802da5f2289bbe363acef084805195c11f453c48
    Author: Frederic Weisbecker <fweisbec@gmail.com>
    AuthorDate: Thu, 22 Oct 2009 23:23:24 +0200
    Committer: Ingo Molnar <mingo@elte.hu>
    CommitDate: Fri, 23 Oct 2009 07:55:19 +0200

    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: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Frederic 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: Ingo Molnar <mingo@elte.hu>
    ---
    tools/perf/Makefile | 1 -
    tools/perf/util/include/asm/bitops.h | 12 ++++++++++++
    tools/perf/util/include/asm/byteorder.h | 2 +-
    tools/perf/util/include/asm/types.h | 17 -----------------
    tools/perf/util/include/linux/types.h | 2 ++
    5 files changed, 15 insertions(+), 19 deletions(-)

    diff --git a/tools/perf/Makefile b/tools/perf/Makefile
    index 65e6e52..0a40c29 100644
    --- a/tools/perf/Makefile
    +++ b/tools/perf/Makefile
    @@ -352,7 +352,6 @@ LIB_H += util/include/asm/bitops.h
    LIB_H += util/include/asm/byteorder.h
    LIB_H += util/include/asm/swab.h
    LIB_H += util/include/asm/system.h
    -LIB_H += util/include/asm/types.h
    LIB_H += util/include/asm/uaccess.h
    LIB_H += perf.h
    LIB_H += util/event.h
    diff --git a/tools/perf/util/include/asm/bitops.h b/tools/perf/util/include/asm/bitops.h
    index fbe4d92..58e9817 100644
    --- a/tools/perf/util/include/asm/bitops.h
    +++ b/tools/perf/util/include/asm/bitops.h
    @@ -1,6 +1,18 @@
    +#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/fls64.h"
    #include "../../../../include/asm-generic/bitops/__ffs.h"
    #include "../../../../include/asm-generic/bitops/ffz.h"
    #include "../../../../include/asm-generic/bitops/hweight.h"
    +
    +#endif
    diff --git a/tools/perf/util/include/asm/byteorder.h b/tools/perf/util/include/asm/byteorder.h
    index 39f367c..b722abe 100644
    --- a/tools/perf/util/include/asm/byteorder.h
    +++ b/tools/perf/util/include/asm/byteorder.h
    @@ -1,2 +1,2 @@
    -#include "../asm/types.h"
    +#include <asm/types.h>
    #include "../../../../include/linux/swab.h"
    diff --git a/tools/perf/util/include/asm/types.h b/tools/perf/util/include/asm/types.h
    deleted file mode 100644
    index 06703c6..0000000
    --- a/tools/perf/util/include/asm/types.h
    +++ /dev/null
    @@ -1,17 +0,0 @@
    -#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_ */
    diff --git a/tools/perf/util/include/linux/types.h b/tools/perf/util/include/linux/types.h
    index 858a38d..196862a 100644
    --- a/tools/perf/util/include/linux/types.h
    +++ b/tools/perf/util/include/linux/types.h
    @@ -1,6 +1,8 @@
    #ifndef _PERF_LINUX_TYPES_H_
    #define _PERF_LINUX_TYPES_H_

    +#include <asm/types.h>
    +
    #define DECLARE_BITMAP(name,bits) \
    unsigned long name[BITS_TO_LONGS(bits)]


    \
     
     \ /
      Last update: 2009-10-24 03:11    [W:0.055 / U:60.448 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site