[PATCH] perf tools: Fix compilation on powerpc

From: Paul Mackerras
Date: Mon Nov 23 2009 - 23:19:57 EST


Currently, perf fails to compile on powerpc with this error:

CC util/header.o
In file included from util/../perf.h:17,
from util/header.c:9:
util/../../../arch/powerpc/include/asm/unistd.h:360:27: error: linux/linkage.h: No such file or directory
make: *** [util/header.o] Error 1

The reason is that we still have a #define __KERNEL__ in effect at the
point where <asm/unistd.h> gets included, which means we get extra
stuff that we don't need or want.

This fixes the problem by undefining __KERNEL__ once we have included
the file for which we need __KERNEL__ defined.

Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
---
tools/perf/util/include/linux/bitops.h | 2 ++
1 file changed, 2 insertions(+)

diff --git a/tools/perf/util/include/linux/bitops.h b/tools/perf/util/include/linux/bitops.h
index ace57c3..8d63116 100644
--- a/tools/perf/util/include/linux/bitops.h
+++ b/tools/perf/util/include/linux/bitops.h
@@ -7,6 +7,8 @@
#define CONFIG_GENERIC_FIND_FIRST_BIT
#include "../../../../include/linux/bitops.h"

+#undef __KERNEL__
+
static inline void set_bit(int nr, unsigned long *addr)
{
addr[nr / BITS_PER_LONG] |= 1UL << (nr % BITS_PER_LONG);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/