Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp443928img; Fri, 22 Mar 2019 01:10:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqyxMiGnErqtFCRPbWgnnS1IGPG4DFIdz7cyOKRLJ7svIHaltH4iOJoGChzPOAA8spotCAV6 X-Received: by 2002:a62:458a:: with SMTP id n10mr8046425pfi.136.1553242231569; Fri, 22 Mar 2019 01:10:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553242231; cv=none; d=google.com; s=arc-20160816; b=ypqBCIr9i++G5q/jjJkETrSODNyycJ/OkU5WQiSTOqVt5USXvh5vq8/LjSzMetruu3 l24aXlGQMfPqcFZxcnhtBvRzbfv/LTnvv02RXMzdFQ5qTNu9sCARRbRZHuGmqaq5I1vX VtUN8cHx+O1qwVnchFBq33EpsGFjV5t9eLnojXWeYMNqD8r3d+MKZnwWSKIO6S6DxvyP zt2ah99Vs8mjngzvYBcDWm/sHaoU/HYawjwrIdH/ineUmvD3jDpDgyP69F7Ny7EPM2al bm4AxAEIoKNzhU8jakUvqpRSmGQO8A1b3Zk6V6jy9gwcYt85dAZgQkL71rN15fOK8GFF d1hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:message-id :dkim-signature; bh=QYIgq5s3l/KmIW7pSyl/Y5gI2CGzi1RN0maTBRyqLko=; b=VEBJ5MP+PJgt2IW2+MfhT/ZArQEqkNFzFYgxTWyDyMPNvBzdcNwblNnJg0qkc/eYhA qwyEZBTLsHawNZMciFvzz7vVItV/BFi24rO1HoohNyYbIPUChx2omi1lYStQzE/d4RpR l6fkYfJvjXCoDOMWIW9cxF9FD29oNq+sYVdzUBBtYR7OoNo0YcOpBwniPPwrwQAwvfC0 Z3uq9kN0B+++JtOBTlCQgmvX9Ljo1rIH7BLomm6gT82nJzLZtFwIYl2ffj9BEzr6KdJJ RrKJdP0QWt6+DclfFEK0kUVU1qviWYYKAY0KhMUlwg6Yi+9AOPEeK5as/hB5F8d8Ssrj Phtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=VzTkpQzK; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 34si6631871plf.43.2019.03.22.01.10.17; Fri, 22 Mar 2019 01:10:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=VzTkpQzK; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727585AbfCVIIm (ORCPT + 99 others); Fri, 22 Mar 2019 04:08:42 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:4816 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726066AbfCVIIl (ORCPT ); Fri, 22 Mar 2019 04:08:41 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 44Qbrl4s4gz9v9vJ; Fri, 22 Mar 2019 09:08:39 +0100 (CET) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=VzTkpQzK; dkim-adsp=pass; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id aIZLQCmG-dlv; Fri, 22 Mar 2019 09:08:39 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 44Qbrl1Hypz9v9vG; Fri, 22 Mar 2019 09:08:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1553242119; bh=QYIgq5s3l/KmIW7pSyl/Y5gI2CGzi1RN0maTBRyqLko=; h=From:Subject:To:Cc:Date:From; b=VzTkpQzKE1QsnsG00Eo126PFnVs2QS34Zfg3LgFr4oUIQ8JPhUj4aSVbH0ArpWmYU 45wBHHcXFTpKYZJ0mVILCus9TpVO8XLwKDlWg2XWQzEWe/6KBNI7m24D/enkiKWd0d T4q4CjH7EKcBOl/cU96nbMhWQiZiaDI5hsqb39Wc= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 21D988B845; Fri, 22 Mar 2019 09:08:40 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id N3ZIohavqxMC; Fri, 22 Mar 2019 09:08:40 +0100 (CET) Received: from po16846vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.231.2]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 00DE68B844; Fri, 22 Mar 2019 09:08:39 +0100 (CET) Received: by po16846vm.idsi0.si.c-s.fr (Postfix, from userid 0) id BD52C6CD85; Fri, 22 Mar 2019 08:08:39 +0000 (UTC) Message-Id: From: Christophe Leroy Subject: [PATCH 1/7] powerpc/fadump: define an empty fadump_cleanup() To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Fri, 22 Mar 2019 08:08:39 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To avoid #ifdefs, define an static inline fadump_cleanup() function when CONFIG_FADUMP is not selected Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/fadump.h | 1 + arch/powerpc/kernel/setup-common.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/powerpc/include/asm/fadump.h b/arch/powerpc/include/asm/fadump.h index 188776befaf9..e2099c0a15c3 100644 --- a/arch/powerpc/include/asm/fadump.h +++ b/arch/powerpc/include/asm/fadump.h @@ -219,5 +219,6 @@ extern void fadump_cleanup(void); static inline int is_fadump_active(void) { return 0; } static inline int should_fadump_crash(void) { return 0; } static inline void crash_fadump(struct pt_regs *regs, const char *str) { } +static inline void fadump_cleanup(void) { } #endif #endif diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 2e5dfb6e0823..971f50d99d87 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -133,13 +133,11 @@ int crashing_cpu = -1; /* also used by kexec */ void machine_shutdown(void) { -#ifdef CONFIG_FA_DUMP /* * if fadump is active, cleanup the fadump registration before we * shutdown. */ fadump_cleanup(); -#endif if (ppc_md.machine_shutdown) ppc_md.machine_shutdown(); -- 2.13.3