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

2 files changed, 7 insertions, 0 deletions

diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
index 76b7fd2d838a..86afdc73322f 100644
--- a/drivers/usb/host/ehci-dbg.c
+++ b/drivers/usb/host/ehci-dbg.c
@@ -369,18 +369,21 @@ static const struct file_operations debug_async_fops = {
         .open           = debug_async_open,
         .read           = debug_output,
         .release        = debug_close,
+        .llseek         = default_llseek,
 };
 static const struct file_operations debug_periodic_fops = {
         .owner          = THIS_MODULE,
         .open           = debug_periodic_open,
         .read           = debug_output,
         .release        = debug_close,
+        .llseek         = default_llseek,
 };
 static const struct file_operations debug_registers_fops = {
         .owner          = THIS_MODULE,
         .open           = debug_registers_open,
         .read           = debug_output,
         .release        = debug_close,
+        .llseek         = default_llseek,
 };
 static const struct file_operations debug_lpm_fops = {
         .owner          = THIS_MODULE,
@@ -388,6 +391,7 @@ static const struct file_operations debug_lpm_fops = {
         .read           = debug_lpm_read,
         .write          = debug_lpm_write,
         .release        = debug_lpm_close,
+        .llseek         = noop_llseek,
 };
 
 static struct dentry *ehci_debug_root;
diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c
index 36abd2baa3ea..d7d34492934a 100644
--- a/drivers/usb/host/ohci-dbg.c
+++ b/drivers/usb/host/ohci-dbg.c
@@ -413,18 +413,21 @@ static const struct file_operations debug_async_fops = {
         .open           = debug_async_open,
         .read           = debug_output,
         .release        = debug_close,
+        .llseek         = default_llseek,
 };
 static const struct file_operations debug_periodic_fops = {
         .owner          = THIS_MODULE,
         .open           = debug_periodic_open,
         .read           = debug_output,
         .release        = debug_close,
+        .llseek         = default_llseek,
 };
 static const struct file_operations debug_registers_fops = {
         .owner          = THIS_MODULE,
         .open           = debug_registers_open,
         .read           = debug_output,
         .release        = debug_close,
+        .llseek         = default_llseek,
 };
 
 static struct dentry *ohci_debug_root;