From 9b85d93ac05f82b43cf6cfbe2392da80f6931a15 Mon Sep 17 00:00:00 2001
From: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Date: Wed, 23 Jun 2010 09:17:53 +0900
Subject: [PATCH] --- yaml --- r: 205272 b: refs/heads/master c:
 5cfaf214856eb934759ae500a0b812dd06a00bd9 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/include/linux/perf_event.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2301f4901b1d..7de4c5e65dfc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45a73372efe4a63f44aa2e1125d4a777c2fdc8d8
+refs/heads/master: 5cfaf214856eb934759ae500a0b812dd06a00bd9
diff --git a/trunk/include/linux/perf_event.h b/trunk/include/linux/perf_event.h
index 0dd5f8ad77ac..937495c25073 100644
--- a/trunk/include/linux/perf_event.h
+++ b/trunk/include/linux/perf_event.h
@@ -936,7 +936,7 @@ extern void __perf_sw_event(u32, u64, int, struct pt_regs *, u64);
 
 #ifndef perf_arch_fetch_caller_regs
 static inline void
-perf_arch_fetch_caller_regs(struct regs *regs, unsigned long ip) { }
+perf_arch_fetch_caller_regs(struct pt_regs *regs, unsigned long ip) { }
 #endif
 
 /*