From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from e35.co.us.ibm.com ([32.97.110.153]) by canuck.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1QApdr-0001YH-Cx for kexec@lists.infradead.org; Fri, 15 Apr 2011 20:29:27 +0000 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by e35.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p3FKDCRS021036 for ; Fri, 15 Apr 2011 14:13:12 -0600 Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p3FKTHRh120906 for ; Fri, 15 Apr 2011 14:29:17 -0600 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p3FKTHIK015554 for ; Fri, 15 Apr 2011 14:29:17 -0600 Date: Fri, 15 Apr 2011 13:29:16 -0700 From: "Paul E. McKenney" Subject: [PATCH] powerpc: Fix kexec-related UP build error Message-ID: <20110415202916.GA6758@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Disposition: inline Reply-To: paulmck@linux.vnet.ibm.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: kexec-bounces@lists.infradead.org Errors-To: kexec-bounces+dwmw2=twosheds.infradead.org@lists.infradead.org To: linuxppc-dev@lists.ozlabs.org Cc: benh@kernel.crashing.org, ebiederm@xmission.com, paulus@samba.org, linux-kernel@vger.kernel.org, kexec@lists.infradead.org Hello! The following patch fixes a UP build problem for kexec() on powerpc. When the crash_kexec_wait_realmode() function was added, it was placed in only two of the three required locations. Thoughts? Thanx, Paul ------------------------------------------------------------------------ The function crash_kexec_wait_realmode() is defined only if SMP, but is called in UP builds. Create an empty function to keep the compiler happy in UP builds. Signed-off-by: Paul E. McKenney Signed-off-by: Paul E. McKenney diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c index 3d3d416..6f964ef 100644 --- a/arch/powerpc/kernel/crash.c +++ b/arch/powerpc/kernel/crash.c @@ -251,6 +251,10 @@ static void crash_kexec_prepare_cpus(int cpu) #endif } +static void crash_kexec_wait_realmode(int cpu) +{ +} + void crash_kexec_secondary(struct pt_regs *regs) { cpus_in_sr = CPU_MASK_NONE; _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e35.co.us.ibm.com (e35.co.us.ibm.com [32.97.110.153]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "e35.co.us.ibm.com", Issuer "Equifax" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id AEA251007D7 for ; Sat, 16 Apr 2011 06:29:22 +1000 (EST) Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com [9.17.195.107]) by e35.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p3FKDDbA021046 for ; Fri, 15 Apr 2011 14:13:13 -0600 Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d03relay05.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p3FKTHWY094456 for ; Fri, 15 Apr 2011 14:29:17 -0600 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p3FKTHIM015554 for ; Fri, 15 Apr 2011 14:29:17 -0600 Date: Fri, 15 Apr 2011 13:29:16 -0700 From: "Paul E. McKenney" To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH] powerpc: Fix kexec-related UP build error Message-ID: <20110415202916.GA6758@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: ebiederm@xmission.com, paulus@samba.org, linux-kernel@vger.kernel.org, kexec@lists.infradead.org Reply-To: paulmck@linux.vnet.ibm.com List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Hello! The following patch fixes a UP build problem for kexec() on powerpc. When the crash_kexec_wait_realmode() function was added, it was placed in only two of the three required locations. Thoughts? Thanx, Paul ------------------------------------------------------------------------ The function crash_kexec_wait_realmode() is defined only if SMP, but is called in UP builds. Create an empty function to keep the compiler happy in UP builds. Signed-off-by: Paul E. McKenney Signed-off-by: Paul E. McKenney diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c index 3d3d416..6f964ef 100644 --- a/arch/powerpc/kernel/crash.c +++ b/arch/powerpc/kernel/crash.c @@ -251,6 +251,10 @@ static void crash_kexec_prepare_cpus(int cpu) #endif } +static void crash_kexec_wait_realmode(int cpu) +{ +} + void crash_kexec_secondary(struct pt_regs *regs) { cpus_in_sr = CPU_MASK_NONE; From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755083Ab1DOU3U (ORCPT ); Fri, 15 Apr 2011 16:29:20 -0400 Received: from e2.ny.us.ibm.com ([32.97.182.142]:36424 "EHLO e2.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750707Ab1DOU3T (ORCPT ); Fri, 15 Apr 2011 16:29:19 -0400 Date: Fri, 15 Apr 2011 13:29:16 -0700 From: "Paul E. McKenney" To: linuxppc-dev@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org, benh@kernel.crashing.org, paulus@samba.org, kexec@lists.infradead.org, ebiederm@xmission.com Subject: [PATCH] powerpc: Fix kexec-related UP build error Message-ID: <20110415202916.GA6758@linux.vnet.ibm.com> Reply-To: paulmck@linux.vnet.ibm.com MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello! The following patch fixes a UP build problem for kexec() on powerpc. When the crash_kexec_wait_realmode() function was added, it was placed in only two of the three required locations. Thoughts? Thanx, Paul ------------------------------------------------------------------------ The function crash_kexec_wait_realmode() is defined only if SMP, but is called in UP builds. Create an empty function to keep the compiler happy in UP builds. Signed-off-by: Paul E. McKenney Signed-off-by: Paul E. McKenney diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c index 3d3d416..6f964ef 100644 --- a/arch/powerpc/kernel/crash.c +++ b/arch/powerpc/kernel/crash.c @@ -251,6 +251,10 @@ static void crash_kexec_prepare_cpus(int cpu) #endif } +static void crash_kexec_wait_realmode(int cpu) +{ +} + void crash_kexec_secondary(struct pt_regs *regs) { cpus_in_sr = CPU_MASK_NONE;