Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

* 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
  vfs: make no_llseek the default
  vfs: don't use BKL in default_llseek
  llseek: automatically add .llseek fop
  libfs: use generic_file_llseek for simple_attr
  mac80211: disallow seeks in minstrel debug code
  lirc: make chardev nonseekable
  viotape: use noop_llseek
  raw: use explicit llseek file operations
  ibmasmfs: use generic_file_llseek
  spufs: use llseek in all file operations
  arm/omap: use generic_file_llseek in iommu_debug
  lkdtm: use generic_file_llseek in debugfs
  net/wireless: use generic_file_llseek in debugfs
  drm: use noop_llseek

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index 24b2b9160aa6..bfe25ea9766b 100644
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -292,6 +292,7 @@ static const struct file_operations raw_fops = {
         .open           = raw_open,
         .release        = raw_release,
         .unlocked_ioctl = raw_ioctl,
+        .llseek         = default_llseek,
         .owner          = THIS_MODULE,
 };
 
@@ -302,6 +303,7 @@ static const struct file_operations raw_ctl_fops = {
 #endif
         .open           = raw_open,
         .owner          = THIS_MODULE,
+        .llseek         = noop_llseek,
 };
 
 static struct cdev raw_cdev;