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

6 files changed, 19 insertions, 0 deletions

diff --git a/drivers/misc/hpilo.c b/drivers/misc/hpilo.c
index 557a8c2a7336..69c1f2fca141 100644
--- a/drivers/misc/hpilo.c
+++ b/drivers/misc/hpilo.c
@@ -640,6 +640,7 @@ static const struct file_operations ilo_fops = {
         .poll           = ilo_poll,
         .open           = ilo_open,
         .release        = ilo_close,
+        .llseek         = noop_llseek,
 };
 
 static irqreturn_t ilo_isr(int irq, void *data)
diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c
index 8844a3f45381..af2497ae5fe3 100644
--- a/drivers/misc/ibmasm/ibmasmfs.c
+++ b/drivers/misc/ibmasm/ibmasmfs.c
@@ -584,6 +584,7 @@ static const struct file_operations command_fops = {
         .release =      command_file_close,
         .read =         command_file_read,
         .write =        command_file_write,
+        .llseek =       generic_file_llseek,
 };
 
 static const struct file_operations event_fops = {
@@ -591,6 +592,7 @@ static const struct file_operations event_fops = {
         .release =      event_file_close,
         .read =         event_file_read,
         .write =        event_file_write,
+        .llseek =       generic_file_llseek,
 };
 
 static const struct file_operations r_heartbeat_fops = {
@@ -598,6 +600,7 @@ static const struct file_operations r_heartbeat_fops = {
         .release =      r_heartbeat_file_close,
         .read =         r_heartbeat_file_read,
         .write =        r_heartbeat_file_write,
+        .llseek =       generic_file_llseek,
 };
 
 static const struct file_operations remote_settings_fops = {
@@ -605,6 +608,7 @@ static const struct file_operations remote_settings_fops = {
         .release =      remote_settings_file_close,
         .read =         remote_settings_file_read,
         .write =        remote_settings_file_write,
+        .llseek =       generic_file_llseek,
 };
 
 
diff --git a/drivers/misc/iwmc3200top/debugfs.c b/drivers/misc/iwmc3200top/debugfs.c
index e9eda471f6e0..62fbaec48207 100644
--- a/drivers/misc/iwmc3200top/debugfs.c
+++ b/drivers/misc/iwmc3200top/debugfs.c
@@ -71,6 +71,7 @@ ssize_t iwmct_dbgfs_##name##_write(struct file *file,			\
         static const struct file_operations iwmct_dbgfs_##name##_ops = {  \
                 .read = iwmct_dbgfs_##name##_read,                      \
                 .open = iwmct_dbgfs_open_file_generic,                  \
+                .llseek = generic_file_llseek,                          \
         };
 
 #define DEBUGFS_WRITE_FILE_OPS(name)                                    \
@@ -78,6 +79,7 @@ ssize_t iwmct_dbgfs_##name##_write(struct file *file,			\
         static const struct file_operations iwmct_dbgfs_##name##_ops = {  \
                 .write = iwmct_dbgfs_##name##_write,                    \
                 .open = iwmct_dbgfs_open_file_generic,                  \
+                .llseek = generic_file_llseek,                          \
         };
 
 #define DEBUGFS_READ_WRITE_FILE_OPS(name)                               \
@@ -87,6 +89,7 @@ ssize_t iwmct_dbgfs_##name##_write(struct file *file,			\
                 .write = iwmct_dbgfs_##name##_write,                    \
                 .read = iwmct_dbgfs_##name##_read,                      \
                 .open = iwmct_dbgfs_open_file_generic,                  \
+                .llseek = generic_file_llseek,                          \
         };
 
 
diff --git a/drivers/misc/lkdtm.c b/drivers/misc/lkdtm.c
index ef34de7a8026..343b5d8ea697 100644
--- a/drivers/misc/lkdtm.c
+++ b/drivers/misc/lkdtm.c
@@ -575,30 +575,39 @@ struct crash_entry {
 
 static const struct crash_entry crash_entries[] = {
         {"DIRECT", {.read = lkdtm_debugfs_read,
+                        .llseek = generic_file_llseek,
                         .open = lkdtm_debugfs_open,
                         .write = direct_entry} },
         {"INT_HARDWARE_ENTRY", {.read = lkdtm_debugfs_read,
+                        .llseek = generic_file_llseek,
                         .open = lkdtm_debugfs_open,
                         .write = int_hardware_entry} },
         {"INT_HW_IRQ_EN", {.read = lkdtm_debugfs_read,
+                        .llseek = generic_file_llseek,
                         .open = lkdtm_debugfs_open,
                         .write = int_hw_irq_en} },
         {"INT_TASKLET_ENTRY", {.read = lkdtm_debugfs_read,
+                        .llseek = generic_file_llseek,
                         .open = lkdtm_debugfs_open,
                         .write = int_tasklet_entry} },
         {"FS_DEVRW", {.read = lkdtm_debugfs_read,
+                        .llseek = generic_file_llseek,
                         .open = lkdtm_debugfs_open,
                         .write = fs_devrw_entry} },
         {"MEM_SWAPOUT", {.read = lkdtm_debugfs_read,
+                        .llseek = generic_file_llseek,
                         .open = lkdtm_debugfs_open,
                         .write = mem_swapout_entry} },
         {"TIMERADD", {.read = lkdtm_debugfs_read,
+                        .llseek = generic_file_llseek,
                         .open = lkdtm_debugfs_open,
                         .write = timeradd_entry} },
         {"SCSI_DISPATCH_CMD", {.read = lkdtm_debugfs_read,
+                        .llseek = generic_file_llseek,
                         .open = lkdtm_debugfs_open,
                         .write = scsi_dispatch_cmd_entry} },
         {"IDE_CORE_CP", {.read = lkdtm_debugfs_read,
+                        .llseek = generic_file_llseek,
                         .open = lkdtm_debugfs_open,
                         .write = ide_core_cp_entry} },
 };
diff --git a/drivers/misc/phantom.c b/drivers/misc/phantom.c
index 3712e5077e25..4197a3cb26ba 100644
--- a/drivers/misc/phantom.c
+++ b/drivers/misc/phantom.c
@@ -280,6 +280,7 @@ static const struct file_operations phantom_file_ops = {
         .unlocked_ioctl = phantom_ioctl,
         .compat_ioctl = phantom_compat_ioctl,
         .poll = phantom_poll,
+        .llseek = no_llseek,
 };
 
 static irqreturn_t phantom_isr(int irq, void *data)
diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c
index cb3b4d228475..28852dfa310d 100644
--- a/drivers/misc/sgi-gru/grufile.c
+++ b/drivers/misc/sgi-gru/grufile.c
@@ -587,6 +587,7 @@ static const struct file_operations gru_fops = {
         .owner          = THIS_MODULE,
         .unlocked_ioctl = gru_file_unlocked_ioctl,
         .mmap           = gru_file_mmap,
+        .llseek         = noop_llseek,
 };
 
 static struct miscdevice gru_miscdev = {