From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Jun 2014 23:09:14 +0000 (-0700)
Subject: Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.16-rc1~40
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=4251c2a67011801caecd63671f26dd8c9aedb24c

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

Pull module updates from Rusty Russell:
 "Most of this is cleaning up various driver sysfs permissions so we can
  re-add the perm check (we unified the module param and sysfs checks,
  but the module ones were stronger so we weakened them temporarily).

  Param parsing gets documented, and also "--" now forces args to be
  handed to init (and ignored by the kernel).

  Module NX/RO protections get tightened: we now set them before calling
  parse_args()"

* tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  module: set nx before marking module MODULE_STATE_COMING.
  samples/kobject/: avoid world-writable sysfs files.
  drivers/hid/hid-picolcd_fb: avoid world-writable sysfs files.
  drivers/staging/speakup/: avoid world-writable sysfs files.
  drivers/regulator/virtual: avoid world-writable sysfs files.
  drivers/scsi/pm8001/pm8001_ctl.c: avoid world-writable sysfs files.
  drivers/hid/hid-lg4ff.c: avoid world-writable sysfs files.
  drivers/video/fbdev/sm501fb.c: avoid world-writable sysfs files.
  drivers/mtd/devices/docg3.c: avoid world-writable sysfs files.
  speakup: fix incorrect perms on speakup_acntsa.c
  cpumask.h: silence warning with -Wsign-compare
  Documentation: Update kernel-parameters.tx
  param: hand arguments after -- straight to init
  modpost: Fix resource leak in read_dump()
---

4251c2a67011801caecd63671f26dd8c9aedb24c
diff --cc init/main.c
index 0ec25157deef,e9d458b5d77b..e8ae1fef0908
--- a/init/main.c
+++ b/init/main.c
@@@ -477,9 -497,9 +498,9 @@@ static void __init mm_init(void
  	vmalloc_init();
  }
  
 -asmlinkage void __init start_kernel(void)
 +asmlinkage __visible void __init start_kernel(void)
  {
- 	char * command_line;
+ 	char * command_line, *after_dashes;
  	extern const struct kernel_param __start___param[], __stop___param[];
  
  	/*