Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 092e0e7e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 79f14b7c 776c163b

Documentation/DocBook/drm.tmpl

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ 
#ifdef CONFIG_COMPAT

		.compat_ioctl = i915_compat_ioctl,

#endif

		.llseek = noop_llseek,

		},

	.pci_driver = {

		.name = DRIVER_NAME,

arch/arm/kernel/etm.c

+1 −0
Original line number Diff line number Diff line
@@ -329,6 +329,7 @@ static const struct file_operations etb_fops = { 
	.read = etb_read,

	.open = etb_open,

	.release = etb_release,

	.llseek = no_llseek,

};



static struct miscdevice etb_miscdev = {

arch/arm/mach-msm/last_radio_log.c

+2 −1
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ static ssize_t last_radio_log_read(struct file *file, char __user *buf, 
}



static struct file_operations last_radio_log_fops = {

	.read = last_radio_log_read

	.read = last_radio_log_read,

	.llseek = default_llseek,

};



void msm_init_last_radio_log(struct module *owner)

arch/arm/mach-msm/smd_debug.c

+1 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ static int debug_open(struct inode *inode, struct file *file) 
static const struct file_operations debug_ops = {

	.read = debug_read,

	.open = debug_open,

	.llseek = default_llseek,

};



static void debug_create(const char *name, mode_t mode,

arch/arm/plat-mxc/audmux-v2.c

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf, 
static const struct file_operations audmux_debugfs_fops = {

	.open = audmux_open_file,

	.read = audmux_read_file,

	.llseek = default_llseek,

};



static void audmux_debugfs_init(void)