From ffbbdc6835f49cfcd92396193ed8cda845e845b9 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@relay.de.ibm.com>
Date: Tue, 23 Mar 2010 19:09:33 +0100
Subject: [PATCH] --- yaml --- r: 191183 b: refs/heads/master c:
 3326c1ceee234e63160852720d48be8a8f7a6d08 h: refs/heads/master i:   191181:
 3830679318e949d4481b735e5004d9179fe73bdf   191179:
 65a8a89c733a9be63c5036874e005a0a0144ce09   191175:
 9f3a67e41b2c6b5fa59b1d7c7f99975c56f8769d   191167:
 14eb9abe70b32690c7dcc3438fa6eb87b4b3b60a v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/perf_event.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0151aa67031c..98dfe29964d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cc8a7c1d8560c042f486b23318a6291569ab96b
+refs/heads/master: 3326c1ceee234e63160852720d48be8a8f7a6d08
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
index 63fbce1c80b5..4aa50ff4efc0 100644
--- a/trunk/kernel/perf_event.c
+++ b/trunk/kernel/perf_event.c
@@ -2645,6 +2645,7 @@ static int perf_fasync(int fd, struct file *filp, int on)
 }
 
 static const struct file_operations perf_fops = {
+	.llseek			= no_llseek,
 	.release		= perf_release,
 	.read			= perf_read,
 	.poll			= perf_poll,