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

Commit 02201e3f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux 

Pull module updates from Rusty Russell:
 "Main excitement here is Peter Zijlstra's lockless rbtree optimization
  to speed module address lookup.  He found some abusers of the module
  lock doing that too.

  A little bit of parameter work here too; including Dan Streetman's
  breaking up the big param mutex so writing a parameter can load
  another module (yeah, really).  Unfortunately that broke the usual
  suspects, !CONFIG_MODULES and !CONFIG_SYSFS, so those fixes were
  appended too"

* tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (26 commits)
  modules: only use mod->param_lock if CONFIG_MODULES
  param: fix module param locks when !CONFIG_SYSFS.
  rcu: merge fix for Convert ACCESS_ONCE() to READ_ONCE() and WRITE_ONCE()
  module: add per-module param_lock
  module: make perm const
  params: suppress unused variable error, warn once just in case code changes.
  modules: clarify CONFIG_MODULE_COMPRESS help, suggest 'N'.
  kernel/module.c: avoid ifdefs for sig_enforce declaration
  kernel/workqueue.c: remove ifdefs over wq_power_efficient
  kernel/params.c: export param_ops_bool_enable_only
  kernel/params.c: generalize bool_enable_only
  kernel/module.c: use generic module param operaters for sig_enforce
  kernel/params: constify struct kernel_param_ops uses
  sysfs: tightened sysfs permission checks
  module: Rework module_addr_{min,max}
  module: Use __module_address() for module_address_lookup()
  module: Make the mod_tree stuff conditional on PERF_EVENTS || TRACING
  module: Optimize __module_address() using a latched RB-tree
  rbtree: Implement generic latch_tree
  seqlock: Introduce raw_read_seqcount_latch()
  ...
parents 0890a264 20bdc2cf

arch/s390/kernel/perf_cpum_sf.c

+1 −1
Original line number Diff line number Diff line
@@ -1572,7 +1572,7 @@ static int param_set_sfb_size(const char *val, const struct kernel_param *kp) 
}



#define param_check_sfb_size(name, p) __param_check(name, p, void)

static struct kernel_param_ops param_ops_sfb_size = {

static const struct kernel_param_ops param_ops_sfb_size = {

	.set = param_set_sfb_size,

	.get = param_get_sfb_size,

};

arch/um/drivers/hostaudio_kern.c

+10 −10
Original line number Diff line number Diff line
@@ -185,9 +185,9 @@ static int hostaudio_open(struct inode *inode, struct file *file) 
	int ret;



#ifdef DEBUG

	kparam_block_sysfs_write(dsp);

	kernel_param_lock(THIS_MODULE);

	printk(KERN_DEBUG "hostaudio: open called (host: %s)\n", dsp);

	kparam_unblock_sysfs_write(dsp);

	kernel_param_unlock(THIS_MODULE);

#endif



	state = kmalloc(sizeof(struct hostaudio_state), GFP_KERNEL);
@@ -199,11 +199,11 @@ static int hostaudio_open(struct inode *inode, struct file *file) 
	if (file->f_mode & FMODE_WRITE)

		w = 1;



	kparam_block_sysfs_write(dsp);

	kernel_param_lock(THIS_MODULE);

	mutex_lock(&hostaudio_mutex);

	ret = os_open_file(dsp, of_set_rw(OPENFLAGS(), r, w), 0);

	mutex_unlock(&hostaudio_mutex);

	kparam_unblock_sysfs_write(dsp);

	kernel_param_unlock(THIS_MODULE);



	if (ret < 0) {

		kfree(state);
@@ -260,17 +260,17 @@ static int hostmixer_open_mixdev(struct inode *inode, struct file *file) 
	if (file->f_mode & FMODE_WRITE)

		w = 1;



	kparam_block_sysfs_write(mixer);

	kernel_param_lock(THIS_MODULE);

	mutex_lock(&hostaudio_mutex);

	ret = os_open_file(mixer, of_set_rw(OPENFLAGS(), r, w), 0);

	mutex_unlock(&hostaudio_mutex);

	kparam_unblock_sysfs_write(mixer);

	kernel_param_unlock(THIS_MODULE);



	if (ret < 0) {

		kparam_block_sysfs_write(dsp);

		kernel_param_lock(THIS_MODULE);

		printk(KERN_ERR "hostaudio_open_mixdev failed to open '%s', "

		       "err = %d\n", dsp, -ret);

		kparam_unblock_sysfs_write(dsp);

		kernel_param_unlock(THIS_MODULE);

		kfree(state);

		return ret;

	}
@@ -326,10 +326,10 @@ MODULE_LICENSE("GPL"); 


static int __init hostaudio_init_module(void)

{

	__kernel_param_lock();

	kernel_param_lock(THIS_MODULE);

	printk(KERN_INFO "UML Audio Relay (host dsp = %s, host mixer = %s)\n",

	       dsp, mixer);

	__kernel_param_unlock();

	kernel_param_unlock(THIS_MODULE);



	module_data.dev_audio = register_sound_dsp(&hostaudio_fops, -1);

	if (module_data.dev_audio < 0) {

arch/x86/kvm/mmu_audit.c

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ static int mmu_audit_set(const char *val, const struct kernel_param *kp) 
	return 0;

}



static struct kernel_param_ops audit_param_ops = {

static const struct kernel_param_ops audit_param_ops = {

	.set = mmu_audit_set,

	.get = param_get_bool,

};

arch/x86/platform/uv/uv_nmi.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static int param_set_local64(const char *val, const struct kernel_param *kp) 
	return 0;

}



static struct kernel_param_ops param_ops_local64 = {

static const struct kernel_param_ops param_ops_local64 = {

	.get = param_get_local64,

	.set = param_set_local64,

};

drivers/block/null_blk.c

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static int null_set_queue_mode(const char *str, const struct kernel_param *kp) 
	return null_param_store_val(str, &queue_mode, NULL_Q_BIO, NULL_Q_MQ);

}



static struct kernel_param_ops null_queue_mode_param_ops = {

static const struct kernel_param_ops null_queue_mode_param_ops = {

	.set	= null_set_queue_mode,

	.get	= param_get_int,

};
@@ -127,7 +127,7 @@ static int null_set_irqmode(const char *str, const struct kernel_param *kp) 
					NULL_IRQ_TIMER);

}



static struct kernel_param_ops null_irqmode_param_ops = {

static const struct kernel_param_ops null_irqmode_param_ops = {

	.set	= null_set_irqmode,

	.get	= param_get_int,

};