Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
Linus Torvalds [Fri, 22 Oct 2010 17:52:56 +0000 (10:52 -0700)]
* '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

101 files changed:
1  2 
arch/arm/kernel/etm.c
arch/arm/plat-mxc/audmux-v2.c
arch/cris/arch-v10/drivers/ds1302.c
arch/cris/arch-v10/drivers/pcf8563.c
arch/cris/arch-v10/drivers/sync_serial.c
arch/cris/arch-v32/drivers/cryptocop.c
arch/cris/arch-v32/drivers/mach-a3/gpio.c
arch/cris/arch-v32/drivers/mach-fs/gpio.c
arch/cris/arch-v32/drivers/pcf8563.c
arch/cris/arch-v32/drivers/sync_serial.c
arch/ia64/kernel/salinfo.c
arch/powerpc/kernel/lparcfg.c
arch/um/drivers/harddog_kern.c
block/bsg.c
drivers/acpi/apei/erst-dbg.c
drivers/block/DAC960.c
drivers/block/aoe/aoechr.c
drivers/block/paride/pg.c
drivers/block/paride/pt.c
drivers/block/pktcdvd.c
drivers/char/apm-emulation.c
drivers/char/ds1302.c
drivers/char/ds1620.c
drivers/char/dsp56k.c
drivers/char/dtlk.c
drivers/char/genrtc.c
drivers/char/ip2/ip2main.c
drivers/char/ipmi/ipmi_devintf.c
drivers/char/ipmi/ipmi_watchdog.c
drivers/char/lp.c
drivers/char/mem.c
drivers/char/mmtimer.c
drivers/char/mwave/mwavedd.c
drivers/char/pcmcia/cm4000_cs.c
drivers/char/pcmcia/cm4040_cs.c
drivers/char/raw.c
drivers/char/rio/rio_linux.c
drivers/char/snsc.c
drivers/char/tlclk.c
drivers/char/toshiba.c
drivers/char/viotape.c
drivers/char/xilinx_hwicap/xilinx_hwicap.c
drivers/gpu/drm/i810/i810_dma.c
drivers/gpu/drm/i830/i830_dma.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
drivers/gpu/vga/vgaarb.c
drivers/hid/hidraw.c
drivers/hid/usbhid/hiddev.c
drivers/ide/ide-tape.c
drivers/input/evdev.c
drivers/input/joydev.c
drivers/input/misc/uinput.c
drivers/macintosh/via-pmu.c
drivers/media/IR/ir-lirc-codec.c
drivers/media/dvb/bt8xx/dst_ca.c
drivers/media/dvb/dvb-core/dmxdev.c
drivers/media/dvb/dvb-core/dvb_ca_en50221.c
drivers/media/dvb/dvb-core/dvb_net.c
drivers/media/dvb/dvb-core/dvbdev.c
drivers/misc/phantom.c
drivers/net/ppp_generic.c
drivers/net/wireless/ray_cs.c
drivers/oprofile/oprofile_files.c
drivers/oprofile/oprofilefs.c
drivers/rtc/rtc-m41t80.c
drivers/scsi/3w-9xxx.c
drivers/scsi/3w-sas.c
drivers/scsi/3w-xxxx.c
drivers/scsi/aacraid/linit.c
drivers/scsi/ch.c
drivers/scsi/dpt_i2o.c
drivers/scsi/gdth.c
drivers/scsi/megaraid.c
drivers/scsi/megaraid/megaraid_mm.c
drivers/scsi/megaraid/megaraid_sas.c
drivers/scsi/mpt2sas/mpt2sas_ctl.c
drivers/scsi/scsi_tgt_if.c
drivers/scsi/sg.c
drivers/serial/mfd.c
drivers/spi/dw_spi.c
drivers/telephony/ixj.c
drivers/usb/core/file.c
drivers/vhost/net.c
drivers/watchdog/cpwd.c
fs/char_dev.c
fs/coda/psdev.c
fs/ecryptfs/file.c
fs/gfs2/file.c
fs/ocfs2/stack_user.c
fs/proc/base.c
fs/proc/task_mmu.c
include/linux/fs.h
kernel/kprobes.c
kernel/trace/blktrace.c
kernel/trace/ftrace.c
kernel/trace/ring_buffer.c
kernel/trace/trace_events.c
net/sunrpc/cache.c
security/apparmor/apparmorfs.c
virt/kvm/kvm_main.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc block/bsg.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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)
@@@ -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)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/char_dev.c
Simple merge
diff --cc fs/coda/psdev.c
Simple merge
Simple merge
diff --cc fs/gfs2/file.c
Simple merge
Simple merge
diff --cc fs/proc/base.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge