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

Commit 74b85f37 authored by Chandra Seetharaman's avatar Chandra Seetharaman Committed by Linus Torvalds
Browse files

[PATCH] cpu hotplug: make cpu_notifier related notifier blocks __cpuinit only 



Make notifier_blocks associated with cpu_notifier as __cpuinitdata.

__cpuinitdata makes sure that the data is init time only unless
CONFIG_HOTPLUG_CPU is defined.

Signed-off-by: default avatarChandra Seetharaman <sekharan@us.ibm.com>
Cc: Ashok Raj <ashok.raj@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 65edc68c

arch/i386/kernel/cpu/intel_cacheinfo.c

+1 −1
Original line number Diff line number Diff line
@@ -747,7 +747,7 @@ static int __cpuinit cacheinfo_cpu_callback(struct notifier_block *nfb, 
	return NOTIFY_OK;

}



static struct notifier_block cacheinfo_cpu_notifier =

static struct notifier_block __cpuinitdata cacheinfo_cpu_notifier =

{

    .notifier_call = cacheinfo_cpu_callback,

};

arch/i386/kernel/cpuid.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb, unsigned long ac 
	return NOTIFY_OK;

}



static struct notifier_block cpuid_class_cpu_notifier =

static struct notifier_block __cpuinitdata cpuid_class_cpu_notifier =

{

	.notifier_call = cpuid_class_cpu_callback,

};

arch/i386/kernel/msr.c

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb, unsigned long acti 
	return NOTIFY_OK;

}



static struct notifier_block msr_class_cpu_notifier =

static struct notifier_block __cpuinitdata msr_class_cpu_notifier =

{

	.notifier_call = msr_class_cpu_callback,

};

arch/ia64/kernel/palinfo.c

+2 −2
Original line number Diff line number Diff line
@@ -959,7 +959,7 @@ remove_palinfo_proc_entries(unsigned int hcpu) 
	}

}



static int __devinit palinfo_cpu_callback(struct notifier_block *nfb,

static int __cpuinit palinfo_cpu_callback(struct notifier_block *nfb,

								unsigned long action,

								void *hcpu)

{
@@ -978,7 +978,7 @@ static int __devinit palinfo_cpu_callback(struct notifier_block *nfb, 
	return NOTIFY_OK;

}



static struct notifier_block palinfo_cpu_notifier =

static struct notifier_block __cpuinitdata palinfo_cpu_notifier =

{

	.notifier_call = palinfo_cpu_callback,

	.priority = 0,

arch/ia64/kernel/topology.c

+1 −1
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ static int __cpuinit cache_cpu_callback(struct notifier_block *nfb, 
	return NOTIFY_OK;

}



static struct notifier_block cache_cpu_notifier =

static struct notifier_block __cpuinitdata cache_cpu_notifier =

{

	.notifier_call = cache_cpu_callback

};