From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752107Ab2BOFBV (ORCPT ); Wed, 15 Feb 2012 00:01:21 -0500 Received: from ozlabs.org ([203.10.76.45]:45686 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751295Ab2BOFAO (ORCPT ); Wed, 15 Feb 2012 00:00:14 -0500 From: Rusty Russell CC: linux-kernel@vger.kernel.org To: "David S. Miller" , sparclinux@vger.kernel.org Message-ID: <1329281884.6232.rusty@rustcorp.com.au> Date: Wed, 15 Feb 2012 15:28:04 +1030 Subject: [PATCH 8/12] arch/sparc: remove references to cpu_*_map. Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rusty Russell This has been obsolescent for a while; time for the final push. Also get rid of obsolescent first_cpu(). Signed-off-by: Rusty Russell Cc: "David S. Miller" Cc: sparclinux@vger.kernel.org --- arch/sparc/kernel/leon_kernel.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/sparc/kernel/leon_kernel.c b/arch/sparc/kernel/leon_kernel.c --- a/arch/sparc/kernel/leon_kernel.c +++ b/arch/sparc/kernel/leon_kernel.c @@ -104,11 +104,11 @@ static int irq_choose_cpu(const struct c { cpumask_t mask; - cpus_and(mask, cpu_online_map, *affinity); - if (cpus_equal(mask, cpu_online_map) || cpus_empty(mask)) + cpumask_and(&mask, cpu_online_mask, affinity); + if (cpumask_equal(&mask, cpu_online_mask) || cpus_empty(mask)) return boot_cpu_id; else - return first_cpu(mask); + return cpumask_first(&mask); } #else #define irq_choose_cpu(affinity) boot_cpu_id