From 8b9910786b5cce2c4089cd74622c9f83e88fe05b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 29 Nov 2012 10:43:28 -0800 Subject: [PATCH] --- yaml --- r: 336933 b: refs/heads/master c: 78d86c213f28193082b5d8a1a424044b7ba406f1 h: refs/heads/master i: 336931: 54bad27e4bae3530d4bcc1c984cac841c4ad68a7 v: v3 --- [refs] | 2 +- trunk/include/linux/init.h | 18 +++++++----------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 52bec2b5b769..f09ae93224f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da095fd3d5063f2dd03468d71f7df39a0430d86f +refs/heads/master: 78d86c213f28193082b5d8a1a424044b7ba406f1 diff --git a/trunk/include/linux/init.h b/trunk/include/linux/init.h index e59041e21df3..f63692d6902e 100644 --- a/trunk/include/linux/init.h +++ b/trunk/include/linux/init.h @@ -93,13 +93,13 @@ #define __exit __section(.exit.text) __exitused __cold notrace -/* Used for HOTPLUG */ -#define __devinit __section(.devinit.text) __cold notrace -#define __devinitdata __section(.devinit.data) -#define __devinitconst __constsection(.devinit.rodata) -#define __devexit __section(.devexit.text) __exitused __cold notrace -#define __devexitdata __section(.devexit.data) -#define __devexitconst __constsection(.devexit.rodata) +/* 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 @@ -126,10 +126,6 @@ #define __INITRODATA .section ".init.rodata","a",%progbits #define __FINITDATA .previous -#define __DEVINIT .section ".devinit.text", "ax" -#define __DEVINITDATA .section ".devinit.data", "aw" -#define __DEVINITRODATA .section ".devinit.rodata", "a" - #define __CPUINIT .section ".cpuinit.text", "ax" #define __CPUINITDATA .section ".cpuinit.data", "aw" #define __CPUINITRODATA .section ".cpuinit.rodata", "a"