Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 054cc8a2d808822dadf488a61729e3e550f114c4

Authored by Chandra Seetharaman
Committed by Linus Torvalds
1 parent 9c7b216d23

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

This patch reverts notifier_block changes made in 2.6.17

Signed-off-by: Chandra Seetharaman <sekharan@us.ibm.com>
Cc: Ashok Raj <ashok.raj@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 9 changed files with 9 additions and 9 deletions Side-by-side Diff

arch/powerpc/kernel/sysfs.c
Diff comments   View file @ 054cc8a
... ... @@ -297,7 +297,7 @@
297 297 return NOTIFY_OK;
298 298 }
299 299  
300   -static struct notifier_block sysfs_cpu_nb = {
  300 +static struct notifier_block __devinitdata sysfs_cpu_nb = {
301 301 .notifier_call = sysfs_cpu_notify,
302 302 };
303 303  
arch/s390/appldata/appldata_base.c
Diff comments   View file @ 054cc8a
... ... @@ -652,7 +652,7 @@
652 652 return NOTIFY_OK;
653 653 }
654 654  
655   -static struct notifier_block appldata_nb = {
  655 +static struct notifier_block __devinitdata appldata_nb = {
656 656 .notifier_call = appldata_cpu_notify,
657 657 };
658 658  
... ... @@ -3403,7 +3403,7 @@
3403 3403 }
3404 3404  
3405 3405  
3406   -static struct notifier_block blk_cpu_notifier = {
  3406 +static struct notifier_block __devinitdata blk_cpu_notifier = {
3407 3407 .notifier_call = blk_cpu_notify,
3408 3408 };
3409 3409  
... ... @@ -857,7 +857,7 @@
857 857 return NOTIFY_OK;
858 858 }
859 859  
860   -static struct notifier_block hrtimers_nb = {
  860 +static struct notifier_block __devinitdata hrtimers_nb = {
861 861 .notifier_call = hrtimer_cpu_notify,
862 862 };
863 863  
... ... @@ -565,7 +565,7 @@
565 565 return NOTIFY_OK;
566 566 }
567 567  
568   -static struct notifier_block rcu_nb = {
  568 +static struct notifier_block __devinitdata rcu_nb = {
569 569 .notifier_call = rcu_cpu_notify,
570 570 };
571 571  
... ... @@ -4805,7 +4805,7 @@
4805 4805 /* Register at highest priority so that task migration (migrate_all_tasks)
4806 4806 * happens before everything else.
4807 4807 */
4808   -static struct notifier_block migration_notifier = {
  4808 +static struct notifier_block __devinitdata migration_notifier = {
4809 4809 .notifier_call = migration_call,
4810 4810 .priority = 10
4811 4811 };
... ... @@ -486,7 +486,7 @@
486 486 return NOTIFY_OK;
487 487 }
488 488  
489   -static struct notifier_block cpu_nfb = {
  489 +static struct notifier_block __devinitdata cpu_nfb = {
490 490 .notifier_call = cpu_callback
491 491 };
492 492  
... ... @@ -142,7 +142,7 @@
142 142 return NOTIFY_OK;
143 143 }
144 144  
145   -static struct notifier_block cpu_nfb = {
  145 +static struct notifier_block __devinitdata cpu_nfb = {
146 146 .notifier_call = cpu_callback
147 147 };
148 148  
... ... @@ -1672,7 +1672,7 @@
1672 1672 return NOTIFY_OK;
1673 1673 }
1674 1674  
1675   -static struct notifier_block timers_nb = {
  1675 +static struct notifier_block __devinitdata timers_nb = {
1676 1676 .notifier_call = timer_cpu_notify,
1677 1677 };
1678 1678