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

Commit 0a80939b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://github.com/rustyrussell/linux 

Autogenerated GPG tag for Rusty D1ADB8F1: 15EE 8D6C AB0E 7F0C F999  BFCB D920 0E6C D1AD B8F1

* tag 'for-linus' of git://github.com/rustyrussell/linux:
  module_param: check that bool parameters really are bool.
  intelfbdrv.c: bailearly is an int module_param
  paride/pcd: fix bool verbose module parameter.
  module_param: make bool parameters really bool (drivers & misc)
  module_param: make bool parameters really bool (arch)
  module_param: make bool parameters really bool (core code)
  kernel/async: remove redundant declaration.
  printk: fix unnecessary module_param_name.
  lirc_parallel: fix module parameter description.
  module_param: avoid bool abuse, add bint for special cases.
  module_param: check type correctness for module_param_array
  modpost: use linker section to generate table.
  modpost: use a table rather than a giant if/else statement.
  modules: sysfs - export: taint, coresize, initsize
  kernel/params: replace DEBUGP with pr_debug
  module: replace DEBUGP with pr_debug
  module: struct module_ref should contains long fields
  module: Fix performance regression on modules with large symbol tables
  module: Add comments describing how the "strmap" logic works

Fix up conflicts in scripts/mod/file2alias.c due to the new linker-
generated table approach to adding __mod_*_device_table entries.  The
ARM sa11x0 mcp bus needed to be converted to that too.
parents 0b48d422 72db395f

Documentation/ABI/testing/sysfs-module

+16 −0
Original line number Diff line number Diff line
@@ -33,3 +33,19 @@ Description: Maximum time allowed for periodic transfers per microframe (μs) 
		Beware, non-standard modes are usually not thoroughly tested by

		hardware designers, and the hardware can malfunction when this

		setting differ from default 100.



What:		/sys/module/*/{coresize,initsize}

Date:		Jan 2012

KernelVersion:»·3.3

Contact:	Kay Sievers <kay.sievers@vrfy.org>

Description:	Module size in bytes.



What:		/sys/module/*/taint

Date:		Jan 2012

KernelVersion:»·3.3

Contact:	Kay Sievers <kay.sievers@vrfy.org>

Description:	Module taint flags:

			P - proprietary module

			O - out-of-tree module

			F - force-loaded module

			C - staging driver module

arch/ia64/hp/common/aml_nfw.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ MODULE_AUTHOR("Bjorn Helgaas <bjorn.helgaas@hp.com>"); 
MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("ACPI opregion handler for native firmware calls");



static int force_register;

static bool force_register;

module_param_named(force, force_register, bool, 0);

MODULE_PARM_DESC(force, "Install opregion handler even without HPQ5001 device");

arch/x86/kernel/apm_32.c

+8 −8
Original line number Diff line number Diff line
@@ -383,21 +383,21 @@ static int ignore_sys_suspend; 
static int ignore_normal_resume;

static int bounce_interval __read_mostly = DEFAULT_BOUNCE_INTERVAL;



static int debug __read_mostly;

static int smp __read_mostly;

static bool debug __read_mostly;

static bool smp __read_mostly;

static int apm_disabled = -1;

#ifdef CONFIG_SMP

static int power_off;

static bool power_off;

#else

static int power_off = 1;

static bool power_off = 1;

#endif

static int realmode_power_off;

static bool realmode_power_off;

#ifdef CONFIG_APM_ALLOW_INTS

static int allow_ints = 1;

static bool allow_ints = 1;

#else

static int allow_ints;

static bool allow_ints;

#endif

static int broken_psr;

static bool broken_psr;



static DECLARE_WAIT_QUEUE_HEAD(apm_waitqueue);

static DECLARE_WAIT_QUEUE_HEAD(apm_suspend_waitqueue);

arch/x86/kvm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ enum { 
#endif



#ifdef MMU_DEBUG

static int dbg = 0;

static bool dbg = 0;

module_param(dbg, bool, 0644);

#endif

arch/x86/kvm/vmx.c

+9 −9
Original line number Diff line number Diff line
@@ -51,29 +51,29 @@ 
MODULE_AUTHOR("Qumranet");

MODULE_LICENSE("GPL");



static int __read_mostly enable_vpid = 1;

static bool __read_mostly enable_vpid = 1;

module_param_named(vpid, enable_vpid, bool, 0444);



static int __read_mostly flexpriority_enabled = 1;

static bool __read_mostly flexpriority_enabled = 1;

module_param_named(flexpriority, flexpriority_enabled, bool, S_IRUGO);



static int __read_mostly enable_ept = 1;

static bool __read_mostly enable_ept = 1;

module_param_named(ept, enable_ept, bool, S_IRUGO);



static int __read_mostly enable_unrestricted_guest = 1;

static bool __read_mostly enable_unrestricted_guest = 1;

module_param_named(unrestricted_guest,

			enable_unrestricted_guest, bool, S_IRUGO);



static int __read_mostly emulate_invalid_guest_state = 0;

static bool __read_mostly emulate_invalid_guest_state = 0;

module_param(emulate_invalid_guest_state, bool, S_IRUGO);



static int __read_mostly vmm_exclusive = 1;

static bool __read_mostly vmm_exclusive = 1;

module_param(vmm_exclusive, bool, S_IRUGO);



static int __read_mostly yield_on_hlt = 1;

static bool __read_mostly yield_on_hlt = 1;

module_param(yield_on_hlt, bool, S_IRUGO);



static int __read_mostly fasteoi = 1;

static bool __read_mostly fasteoi = 1;

module_param(fasteoi, bool, S_IRUGO);



/*
@@ -81,7 +81,7 @@ module_param(fasteoi, bool, S_IRUGO); 
 * VMX and be a hypervisor for its own guests. If nested=0, guests may not

 * use VMX instructions.

 */

static int __read_mostly nested = 0;

static bool __read_mostly nested = 0;

module_param(nested, bool, S_IRUGO);



#define KVM_GUEST_CR0_MASK_UNRESTRICTED_GUEST				\