diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-14 09:07:11 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-14 09:07:11 -0800 |
commit | 3441f0d26d02ec8073ea9ac7d1a4da8a9818ad59 (patch) | |
tree | fb82a5ae8ec99df63ed13ea72d9eaf1d8ed0c0b7 /include/linux | |
parent | f6a0e2ca7b1fe89da4e4b0afa6ba08dc34f1a0f7 (diff) | |
parent | f1688e0431d3a395388e70fe21da89ed0de0c323 (diff) | |
download | linux-3.10-3441f0d26d02ec8073ea9ac7d1a4da8a9818ad59.tar.gz linux-3.10-3441f0d26d02ec8073ea9ac7d1a4da8a9818ad59.tar.bz2 linux-3.10-3441f0d26d02ec8073ea9ac7d1a4da8a9818ad59.zip |
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
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/init.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index a799273714a..10ed4f43645 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -93,14 +93,6 @@ #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 */ #define __cpuinit __section(.cpuinit.text) __cold notrace #define __cpuinitdata __section(.cpuinit.data) @@ -337,18 +329,6 @@ void __init parse_early_options(char *cmdline); #define __INITRODATA_OR_MODULE __INITRODATA #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 #define __exit_p(x) x #else |