Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

* 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

+1 -21
+1 -1
fs/debugfs/inode.c
··· 176 176 opts->uid = uid; 177 177 break; 178 178 case Opt_gid: 179 - if (match_octal(&args[0], &option)) 179 + if (match_int(&args[0], &option)) 180 180 return -EINVAL; 181 181 gid = make_kgid(current_user_ns(), option); 182 182 if (!gid_valid(gid))
-20
include/linux/init.h
··· 93 93 94 94 #define __exit __section(.exit.text) __exitused __cold notrace 95 95 96 - /* Used for HOTPLUG, but that is always enabled now, so just make them noops */ 97 - #define __devinit 98 - #define __devinitdata 99 - #define __devinitconst 100 - #define __devexit 101 - #define __devexitdata 102 - #define __devexitconst 103 - 104 96 /* Used for HOTPLUG_CPU */ 105 97 #define __cpuinit __section(.cpuinit.text) __cold notrace 106 98 #define __cpuinitdata __section(.cpuinit.data) ··· 328 336 #define __INITDATA_OR_MODULE __INITDATA 329 337 #define __INITRODATA_OR_MODULE __INITRODATA 330 338 #endif /*CONFIG_MODULES*/ 331 - 332 - /* Functions marked as __devexit may be discarded at kernel link time, depending 333 - on config options. Newer versions of binutils detect references from 334 - retained sections to discarded sections and flag an error. Pointers to 335 - __devexit functions must use __devexit_p(function_name), the wrapper will 336 - insert either the function_name or NULL, depending on the config options. 337 - */ 338 - #if defined(MODULE) || defined(CONFIG_HOTPLUG) 339 - #define __devexit_p(x) x 340 - #else 341 - #define __devexit_p(x) NULL 342 - #endif 343 339 344 340 #ifdef MODULE 345 341 #define __exit_p(x) x