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

Commit 9c7b216d authored by Chandra Seetharaman's avatar Chandra Seetharaman Committed by Linus Torvalds
Browse files

[PATCH] cpu hotplug: revert init patch submitted for 2.6.17 



In 2.6.17, there was a problem with cpu_notifiers and XFS.  I provided a
band-aid solution to solve that problem.  In the process, i undid all the
changes you both were making to ensure that these notifiers were available
only at init time (unless CONFIG_HOTPLUG_CPU is defined).

We deferred the real fix to 2.6.18.  Here is a set of patches that fixes the
XFS problem cleanly and makes the cpu notifiers available only at init time
(unless CONFIG_HOTPLUG_CPU is defined).

If CONFIG_HOTPLUG_CPU is defined then cpu notifiers are available at run
time.

This patch reverts the notifier_call changes made in 2.6.17

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 6ac12dfe

arch/i386/kernel/cpu/intel_cacheinfo.c

+1 −1
Original line number Diff line number Diff line
@@ -729,7 +729,7 @@ static void __cpuexit cache_remove_dev(struct sys_device * sys_dev) 
	return;

}



static int cacheinfo_cpu_callback(struct notifier_block *nfb,

static int __cpuinit cacheinfo_cpu_callback(struct notifier_block *nfb,

					unsigned long action, void *hcpu)

{

	unsigned int cpu = (unsigned long)hcpu;

arch/ia64/kernel/palinfo.c

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

}



static int palinfo_cpu_callback(struct notifier_block *nfb,

static int __devinit palinfo_cpu_callback(struct notifier_block *nfb,

								unsigned long action,

								void *hcpu)

{

arch/ia64/kernel/salinfo.c

+1 −1
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ static struct file_operations salinfo_data_fops = { 
};



#ifdef	CONFIG_HOTPLUG_CPU

static int

static int __devinit

salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)

{

	unsigned int i, cpu = (unsigned long)hcpu;

arch/ia64/kernel/topology.c

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ static int __cpuinit cache_remove_dev(struct sys_device * sys_dev) 
 * When a cpu is hot-plugged, do a check and initiate

 * cache kobject if necessary

 */

static int cache_cpu_callback(struct notifier_block *nfb,

static int __cpuinit cache_cpu_callback(struct notifier_block *nfb,

		unsigned long action, void *hcpu)

{

	unsigned int cpu = (unsigned long)hcpu;

arch/powerpc/kernel/sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static void unregister_cpu_online(unsigned int cpu) 
}

#endif /* CONFIG_HOTPLUG_CPU */



static int sysfs_cpu_notify(struct notifier_block *self,

static int __devinit sysfs_cpu_notify(struct notifier_block *self,

				      unsigned long action, void *hcpu)

{

	unsigned int cpu = (unsigned int)(long)hcpu;