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, 9 insertions, 0 deletions

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} },
 };