Merge commit 'v2.6.36-rc1' into HEAD

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
index 5df60a6b6776..dd87e86048be 100644
--- a/drivers/oprofile/event_buffer.c
+++ b/drivers/oprofile/event_buffer.c
@@ -135,7 +135,7 @@ static int event_buffer_open(struct inode *inode, struct file *file)
          * echo 1 >/dev/oprofile/enable
          */
 
-        return 0;
+        return nonseekable_open(inode, file);
 
 fail:
         dcookie_unregister(file->private_data);
@@ -205,4 +205,5 @@ const struct file_operations event_buffer_fops = {
         .open           = event_buffer_open,
         .release        = event_buffer_release,
         .read           = event_buffer_read,
+        .llseek         = no_llseek,
 };