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

Commit 3441f0d2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-3.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 



Pull driver core fixes from Greg Kroah-Hartman:
 "Here are two patches for 3.8-rc3.

  One removes the __dev* defines from init.h now that all usages of it
  are gone from your tree.  The other fix is for debugfs's paramater
  that was using the wrong base for the option.

  Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">

* tag 'driver-core-3.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  debugfs: convert gid= argument from decimal, not octal
  Remove __dev* markings from init.h
parents f6a0e2ca f1688e04

fs/debugfs/inode.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -176,7 +176,7 @@ static int debugfs_parse_options(char *data, struct debugfs_mount_opts *opts) 
			opts->uid = uid;

			opts->uid = uid;

			break;

			break;

		case Opt_gid:

		case Opt_gid:

			if (match_octal(&args[0], &option))

			if (match_int(&args[0], &option))

				return -EINVAL;

				return -EINVAL;

			gid = make_kgid(current_user_ns(), option);

			gid = make_kgid(current_user_ns(), option);

			if (!gid_valid(gid))

			if (!gid_valid(gid))

include/linux/init.h

+0 −20
Original line number Original line Diff line number Diff line
@@ -93,14 +93,6 @@ 




#define __exit          __section(.exit.text) __exitused __cold notrace

#define __exit          __section(.exit.text) __exitused __cold notrace





/* Used for HOTPLUG, but that is always enabled now, so just make them noops */

#define __devinit

#define __devinitdata

#define __devinitconst

#define __devexit

#define __devexitdata

#define __devexitconst



/* Used for HOTPLUG_CPU */

/* Used for HOTPLUG_CPU */

#define __cpuinit        __section(.cpuinit.text) __cold notrace

#define __cpuinit        __section(.cpuinit.text) __cold notrace

#define __cpuinitdata    __section(.cpuinit.data)

#define __cpuinitdata    __section(.cpuinit.data)
@@ -337,18 +329,6 @@ void __init parse_early_options(char *cmdline); 
#define __INITRODATA_OR_MODULE __INITRODATA

#define __INITRODATA_OR_MODULE __INITRODATA

#endif /*CONFIG_MODULES*/

#endif /*CONFIG_MODULES*/





/* Functions marked as __devexit may be discarded at kernel link time, depending

   on config options.  Newer versions of binutils detect references from

   retained sections to discarded sections and flag an error.  Pointers to

   __devexit functions must use __devexit_p(function_name), the wrapper will

   insert either the function_name or NULL, depending on the config options.

 */

#if defined(MODULE) || defined(CONFIG_HOTPLUG)

#define __devexit_p(x) x

#else

#define __devexit_p(x) NULL

#endif



#ifdef MODULE

#ifdef MODULE

#define __exit_p(x) x

#define __exit_p(x) x

#else

#else