Commit-ID:  f2b4367a69c60c644a1df36f63a65e0e677d3b0f
Gitweb:     http://git.kernel.org/tip/f2b4367a69c60c644a1df36f63a65e0e677d3b0f
Author:     Sukadev Bhattiprolu <[email protected]>
AuthorDate: Tue, 5 Feb 2013 15:04:49 -0800
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 6 Feb 2013 12:07:21 +0100

perf/powerpc: Fix build error

Fix compile errors like those below:

  CC      arch/powerpc/perf/power7-pmu.o
   /home/git/linux/arch/powerpc/perf/power7-pmu.c:397:2: error: initialization 
from incompatible pointer type [-Werror]

Reported-by: Stephen Rothwell <[email protected]>
Signed-off-by: Sukadev Bhattiprolu <[email protected]>
Acked-by: Arnaldo Carvalho de Melo <[email protected]>
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
 arch/powerpc/include/asm/perf_event_server.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/include/asm/perf_event_server.h 
b/arch/powerpc/include/asm/perf_event_server.h
index b29fcc6..136bba6 100644
--- a/arch/powerpc/include/asm/perf_event_server.h
+++ b/arch/powerpc/include/asm/perf_event_server.h
@@ -124,7 +124,7 @@ extern ssize_t power_events_sysfs_show(struct device *dev,
  * POWER CPU specification.
  */
 #define        EVENT_VAR(_id, _suffix)         event_attr_##_id##_suffix
-#define        EVENT_PTR(_id, _suffix)         &EVENT_VAR(_id, _suffix)
+#define        EVENT_PTR(_id, _suffix)         &EVENT_VAR(_id, 
_suffix).attr.attr
 
 #define        EVENT_ATTR(_name, _id, _suffix)                                 
\
        PMU_EVENT_ATTR(_name, EVENT_VAR(_id, _suffix), PME_PM_##_id,    \
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to