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

diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
index 4cccc29964f..fb339c3852e 100644
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
@@ -271,6 +271,7 @@ static const struct file_operations fops_beacon = {
         .write = write_file_beacon,
         .open = ath5k_debugfs_open,
         .owner = THIS_MODULE,
+        .llseek = default_llseek,
 };
 
 
@@ -290,6 +291,7 @@ static const struct file_operations fops_reset = {
         .write = write_file_reset,
         .open = ath5k_debugfs_open,
         .owner = THIS_MODULE,
+        .llseek = noop_llseek,
 };
 
 
@@ -369,6 +371,7 @@ static const struct file_operations fops_debug = {
         .write = write_file_debug,
         .open = ath5k_debugfs_open,
         .owner = THIS_MODULE,
+        .llseek = default_llseek,
 };
 
 
@@ -480,6 +483,7 @@ static const struct file_operations fops_antenna = {
         .write = write_file_antenna,
         .open = ath5k_debugfs_open,
         .owner = THIS_MODULE,
+        .llseek = default_llseek,
 };
 
 
@@ -591,6 +595,7 @@ static const struct file_operations fops_frameerrors = {
         .write = write_file_frameerrors,
         .open = ath5k_debugfs_open,
         .owner = THIS_MODULE,
+        .llseek = default_llseek,
 };
 
 
@@ -748,6 +753,7 @@ static const struct file_operations fops_ani = {
         .write = write_file_ani,
         .open = ath5k_debugfs_open,
         .owner = THIS_MODULE,
+        .llseek = default_llseek,
 };
 
 
@@ -811,6 +817,7 @@ static const struct file_operations fops_queue = {
         .write = write_file_queue,
         .open = ath5k_debugfs_open,
         .owner = THIS_MODULE,
+        .llseek = default_llseek,
 };