diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-08-04 14:25:47 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-08-04 14:25:47 (GMT) |
commit | 12a81c8df13c60904febcafcf6b90ca1acb67122 (patch) | |
tree | 840e3d06e13d1eb4e8b224699a95a5f345565ee4 /drivers | |
parent | 43d7383bbec1878f838060d6bbd214f6d0485478 (diff) | |
parent | 729419f0090601406abe714c5f8872a3bd53ff68 (diff) | |
download | linux-fsl-qoriq-12a81c8df13c60904febcafcf6b90ca1acb67122.tar.xz |
Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/oprofile/event_buffer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c index 5df60a6..dd87e86 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, }; |