diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 10:52:56 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 10:52:56 -0700 | 
| commit | 092e0e7e520a1fca03e13c9f2d157432a8657ff2 (patch) | |
| tree | 451897252c4c08c4b5a8ef535da156f1e817e80b /drivers/net/wireless/rt2x00/rt2x00debug.c | |
| parent | 79f14b7c56d3b3ba58f8b43d1f70b9b71477a800 (diff) | |
| parent | 776c163b1b93c8dfa5edba885bc2bfbc2d228a5f (diff) | |
| download | olio-linux-3.10-092e0e7e520a1fca03e13c9f2d157432a8657ff2.tar.xz olio-linux-3.10-092e0e7e520a1fca03e13c9f2d157432a8657ff2.zip  | |
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
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00debug.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00debug.c | 5 | 
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00debug.c b/drivers/net/wireless/rt2x00/rt2x00debug.c index b0498e7e7aa..cea81e4c5c8 100644 --- a/drivers/net/wireless/rt2x00/rt2x00debug.c +++ b/drivers/net/wireless/rt2x00/rt2x00debug.c @@ -315,6 +315,7 @@ static const struct file_operations rt2x00debug_fop_queue_dump = {  	.poll		= rt2x00debug_poll_queue_dump,  	.open		= rt2x00debug_open_queue_dump,  	.release	= rt2x00debug_release_queue_dump, +	.llseek		= default_llseek,  };  static ssize_t rt2x00debug_read_queue_stats(struct file *file, @@ -371,6 +372,7 @@ static const struct file_operations rt2x00debug_fop_queue_stats = {  	.read		= rt2x00debug_read_queue_stats,  	.open		= rt2x00debug_file_open,  	.release	= rt2x00debug_file_release, +	.llseek		= default_llseek,  };  #ifdef CONFIG_RT2X00_LIB_CRYPTO @@ -423,6 +425,7 @@ static const struct file_operations rt2x00debug_fop_crypto_stats = {  	.read		= rt2x00debug_read_crypto_stats,  	.open		= rt2x00debug_file_open,  	.release	= rt2x00debug_file_release, +	.llseek		= default_llseek,  };  #endif @@ -509,6 +512,7 @@ static const struct file_operations rt2x00debug_fop_##__name = {\  	.write		= rt2x00debug_write_##__name,		\  	.open		= rt2x00debug_file_open,		\  	.release	= rt2x00debug_file_release,		\ +	.llseek		= generic_file_llseek,			\  };  RT2X00DEBUGFS_OPS(csr, "0x%.8x\n", u32); @@ -542,6 +546,7 @@ static const struct file_operations rt2x00debug_fop_dev_flags = {  	.read		= rt2x00debug_read_dev_flags,  	.open		= rt2x00debug_file_open,  	.release	= rt2x00debug_file_release, +	.llseek		= default_llseek,  };  static struct dentry *rt2x00debug_create_file_driver(const char *name,  |