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

Commit 80b5184c authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds
Browse files

kernel/: convert cpu notifier to return encapsulate errno value 



By the previous modification, the cpu notifier can return encapsulate
errno value.  This converts the cpu notifiers for kernel/*.c

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ad84bb5b

kernel/padata.c

+2 −2
Original line number Diff line number Diff line
@@ -659,7 +659,7 @@ static int padata_cpu_callback(struct notifier_block *nfb, 
		err = __padata_add_cpu(pinst, cpu);

		mutex_unlock(&pinst->lock);

		if (err)

			return NOTIFY_BAD;

			return notifier_from_errno(err);

		break;



	case CPU_DOWN_PREPARE:
@@ -670,7 +670,7 @@ static int padata_cpu_callback(struct notifier_block *nfb, 
		err = __padata_remove_cpu(pinst, cpu);

		mutex_unlock(&pinst->lock);

		if (err)

			return NOTIFY_BAD;

			return notifier_from_errno(err);

		break;



	case CPU_UP_CANCELED:

kernel/profile.c

+2 −2
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ static int __cpuinit profile_cpu_callback(struct notifier_block *info, 
					GFP_KERNEL | __GFP_ZERO,

					0);

			if (!page)

				return NOTIFY_BAD;

				return notifier_from_errno(-ENOMEM);

			per_cpu(cpu_profile_hits, cpu)[1] = page_address(page);

		}

		if (!per_cpu(cpu_profile_hits, cpu)[0]) {
@@ -388,7 +388,7 @@ out_free: 
		page = virt_to_page(per_cpu(cpu_profile_hits, cpu)[1]);

		per_cpu(cpu_profile_hits, cpu)[1] = NULL;

		__free_page(page);

		return NOTIFY_BAD;

		return notifier_from_errno(-ENOMEM);

	case CPU_ONLINE:

	case CPU_ONLINE_FROZEN:

		if (prof_cpu_mask != NULL)

kernel/relay.c

+1 −1
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ static int __cpuinit relay_hotcpu_callback(struct notifier_block *nb, 
					"relay_hotcpu_callback: cpu %d buffer "

					"creation failed\n", hotcpu);

				mutex_unlock(&relay_channels_mutex);

				return NOTIFY_BAD;

				return notifier_from_errno(-ENOMEM);

			}

		}

		mutex_unlock(&relay_channels_mutex);

kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu) 
	case CPU_UP_PREPARE_FROZEN:

		if (!zalloc_cpumask_var_node(&cfd->cpumask, GFP_KERNEL,

				cpu_to_node(cpu)))

			return NOTIFY_BAD;

			return notifier_from_errno(-ENOMEM);

		break;



#ifdef CONFIG_HOTPLUG_CPU

kernel/softirq.c

+1 −1
Original line number Diff line number Diff line
@@ -808,7 +808,7 @@ static int __cpuinit cpu_callback(struct notifier_block *nfb, 
		p = kthread_create(run_ksoftirqd, hcpu, "ksoftirqd/%d", hotcpu);

		if (IS_ERR(p)) {

			printk("ksoftirqd for %i failed\n", hotcpu);

			return NOTIFY_BAD;

			return notifier_from_errno(PTR_ERR(p));

		}

		kthread_bind(p, hotcpu);

  		per_cpu(ksoftirqd, hotcpu) = p;