From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 Oct 2010 17:52:56 +0000 (-0700)
Subject: Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
X-Git-Tag: v2.6.37-rc1~173
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=092e0e7e520a1fca03e13c9f2d157432a8657ff2;p=linux.git

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
---

092e0e7e520a1fca03e13c9f2d157432a8657ff2
diff --cc drivers/char/raw.c
index 24b2b9160aa6,28c0169e34da..bfe25ea9766b
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@@ -297,11 -264,9 +298,12 @@@ static const struct file_operations raw
  
  static const struct file_operations raw_ctl_fops = {
  	.unlocked_ioctl = raw_ctl_ioctl,
 +#ifdef CONFIG_COMPAT
 +	.compat_ioctl	= raw_ctl_compat_ioctl,
 +#endif
  	.open		= raw_open,
  	.owner		= THIS_MODULE,
+ 	.llseek		= noop_llseek,
  };
  
  static struct cdev raw_cdev;
diff --cc drivers/gpu/drm/i810/i810_dma.c
index fb07e73581e8,00f1bdaa65cd..ff33e53bbbf8
--- a/drivers/gpu/drm/i810/i810_dma.c
+++ b/drivers/gpu/drm/i810/i810_dma.c
@@@ -116,9 -116,10 +116,10 @@@ static int i810_mmap_buffers(struct fil
  static const struct file_operations i810_buffer_fops = {
  	.open = drm_open,
  	.release = drm_release,
 -	.unlocked_ioctl = drm_ioctl,
 +	.unlocked_ioctl = i810_ioctl,
  	.mmap = i810_mmap_buffers,
  	.fasync = drm_fasync,
+ 	.llseek = noop_llseek,
  };
  
  static int i810_map_buffer(struct drm_buf *buf, struct drm_file *file_priv)
diff --cc drivers/gpu/drm/i830/i830_dma.c
index cc92c7e6236f,5c6eb65f4e51..ca6f31ff0eec
--- a/drivers/gpu/drm/i830/i830_dma.c
+++ b/drivers/gpu/drm/i830/i830_dma.c
@@@ -118,9 -118,10 +118,10 @@@ static int i830_mmap_buffers(struct fil
  static const struct file_operations i830_buffer_fops = {
  	.open = drm_open,
  	.release = drm_release,
 -	.unlocked_ioctl = drm_ioctl,
 +	.unlocked_ioctl = i830_ioctl,
  	.mmap = i830_mmap_buffers,
  	.fasync = drm_fasync,
+ 	.llseek = noop_llseek,
  };
  
  static int i830_map_buffer(struct drm_buf *buf, struct drm_file *file_priv)