From patchwork Wed Mar 23 15:11:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Bottomley X-Patchwork-Id: 656231 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2NFC7aU027255 for ; Wed, 23 Mar 2011 15:12:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933023Ab1CWPMF (ORCPT ); Wed, 23 Mar 2011 11:12:05 -0400 Received: from cantor.suse.de ([195.135.220.2]:38193 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932997Ab1CWPMF (ORCPT ); Wed, 23 Mar 2011 11:12:05 -0400 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id 08DB993EE3; Wed, 23 Mar 2011 16:12:03 +0100 (CET) Subject: [PATCH] fix compile breakage caused by linux/smp.h header definition problem From: James Bottomley To: Linus Torvalds Cc: Andrew Morton , Amerigo Wang , Parisc List Date: Wed, 23 Mar 2011 10:11:58 -0500 Message-ID: <1300893119.15899.15.camel@mulgrave.site> Mime-Version: 1.0 X-Mailer: Evolution 2.32.1 Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 23 Mar 2011 15:12:30 +0000 (UTC) diff --git a/include/linux/smp.h b/include/linux/smp.h index 48159dd..04d6e0d 100644 --- a/include/linux/smp.h +++ b/include/linux/smp.h @@ -114,8 +114,8 @@ int on_each_cpu(smp_call_func_t func, void *info, int wait); void smp_prepare_boot_cpu(void); extern unsigned int setup_max_cpus; -extern void __init setup_nr_cpu_ids(void); -extern void __init smp_init(void); +extern void setup_nr_cpu_ids(void); +extern void smp_init(void); #else /* !SMP */