linux-kernel - linux-next: manual merge of the akpm-current tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Date:	Sat, 2 Feb 2013 23:55:52 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Shaohua Li <shli@...nel.org>,
	Wang YanQing <udknight@...il.com>,
	Ingo Molnar <mingo@...nel.org>
Subject: linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
kernel/smp.c between commit f44310b98ddb ("smp: Fix SMP function call
empty cpu mask race") from Linus' tree and commit "smp: make
smp_call_function_many() use logic similar to smp_call_function_single()"
from the akpm-current tree.

I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc kernel/smp.c
index 69f38bd,bb92c52..0000000
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@@ -57,9 -47,11 +47,15 @@@ hotplug_cfd(struct notifier_block *nfb
  		if (!zalloc_cpumask_var_node(&cfd->cpumask, GFP_KERNEL,
  				cpu_to_node(cpu)))
  			return notifier_from_errno(-ENOMEM);
 +		if (!zalloc_cpumask_var_node(&cfd->cpumask_ipi, GFP_KERNEL,
 +				cpu_to_node(cpu)))
 +			return notifier_from_errno(-ENOMEM);
+ 		cfd->csd = alloc_percpu(struct call_single_data);
+ 		if (!cfd->csd) {
++			free_cpumask_var(cfd->cpumask_ipi);
+ 			free_cpumask_var(cfd->cpumask);
+ 			return notifier_from_errno(-ENOMEM);
+ 		}
  		break;
  
  #ifdef CONFIG_HOTPLUG_CPU
@@@ -69,7 -61,7 +65,8 @@@
  	case CPU_DEAD:
  	case CPU_DEAD_FROZEN:
  		free_cpumask_var(cfd->cpumask);
 +		free_cpumask_var(cfd->cpumask_ipi);
+ 		free_percpu(cfd->csd);
  		break;
  #endif
  	};

Content of type "application/pgp-signature" skipped