Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp3581548ybi; Mon, 29 Jul 2019 09:00:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqwtD37eJkeBzml9c6Nwl9qUL3IJjd20dAqIGsY3nPNqxC0CQgAHRGW/yiVPKuTYamVhPhkg X-Received: by 2002:a17:902:7687:: with SMTP id m7mr57285359pll.310.1564416037673; Mon, 29 Jul 2019 09:00:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564416037; cv=none; d=google.com; s=arc-20160816; b=eWBMgEt4tC5A2nu/V4lDXxMVQoruG8ookfdKmb1/nipCawX+3m0ZbsJulb33/mVjuu C3ih2vH5iL0Ozq+Ofnx8cinhNdVYuFaijsWrjRjvya9QYvyFvZ3f2AyRncb5hcOgRWlq 2XIWW8Y4BKyEl2kbcRKODRlN0FP8rNcX8hDZh7/iKfNW7QxwBanqlPVcEKsPAh9vHhCK cWqwE68bDSugAREYFiQVG3/qSwIru30wBo0igp0nKNmY1RFsUl9BjFPiU6XQD4fOmS/e MN83gv7N1xTdXW7Ge25ZMOWlkjTu5f+/1YoRo7WBAXVuYHCgDUTmOp0bXPMemFKxLzpE Uuyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:content-disposition :mime-version:subject:cc:to:from:date; bh=0ViwUo6sqTfa/7a/x4WqjmWHmVpnBIcWP4q6w6luNDg=; b=u2hkmRqUIEQr6mXm42+qeApbXiJnC6pRDkAHqln+zTRFhd0XFwj/hHF+aMbodqvE8k FKEq1Qekx09zj67L4i99hAVYgDnZL/fElLMQJazlowCh+nioCPMRDNzZ/uIJJEU3A6mj k5ypxqVMeIJDUz0ZpPBc5SXZE2W4exaF3zrZdXE2M/huAfB2W+cZqYcXHyDt9oRWRRj1 B/5UTcP4HeXEDr8UoRy3zPz0MoYqo1ynMVQ9Zg+QenEV0UCdzj5ygvTPe67E8mNN0IXD BBqJn6rn2sOOgFv9cYC1AuEJoy6SjIIPnAj4JWEXR8UP+EVC72fCAzV6FVdTDP6dL1OI s+rQ== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 3si25492206plx.344.2019.07.29.09.00.22; Mon, 29 Jul 2019 09:00:37 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727488AbfG2MOl (ORCPT + 99 others); Mon, 29 Jul 2019 08:14:41 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:44648 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726972AbfG2MOk (ORCPT ); Mon, 29 Jul 2019 08:14:40 -0400 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x6TCA8hP057115 for ; Mon, 29 Jul 2019 08:14:39 -0400 Received: from e06smtp03.uk.ibm.com (e06smtp03.uk.ibm.com [195.75.94.99]) by mx0a-001b2d01.pphosted.com with ESMTP id 2u1y2fwjpt-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 29 Jul 2019 08:14:39 -0400 Received: from localhost by e06smtp03.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 29 Jul 2019 13:14:36 +0100 Received: from b06avi18626390.portsmouth.uk.ibm.com (9.149.26.192) by e06smtp03.uk.ibm.com (192.168.101.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 29 Jul 2019 13:14:33 +0100 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06avi18626390.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x6TCEGWk13042042 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 29 Jul 2019 12:14:16 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 217A6AE051; Mon, 29 Jul 2019 12:14:32 +0000 (GMT) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E27EDAE05A; Mon, 29 Jul 2019 12:14:31 +0000 (GMT) Received: from localhost (unknown [9.152.212.110]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Mon, 29 Jul 2019 12:14:31 +0000 (GMT) Date: Mon, 29 Jul 2019 14:14:30 +0200 From: Vasily Gorbik To: Eric Biederman , Andrew Morton Cc: kexec@lists.infradead.org, linux-kernel@vger.kernel.org, Dave Young , AKASHI Takahiro Subject: [PATCH] kexec: restore arch_kexec_kernel_image_probe declaration MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline X-Patchwork-Bot: notify X-TM-AS-GCONF: 00 x-cbid: 19072912-0012-0000-0000-0000033748B9 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19072912-0013-0000-0000-00002170E9DA Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-07-29_06:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=928 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1907290145 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org arch_kexec_kernel_image_probe function declaration has been removed by commit 9ec4ecef0af7 ("kexec_file,x86,powerpc: factor out kexec_file_ops functions"). Still this function is overridden by couple of architectures and proper prototype declaration is therefore important, so bring it back. This fixes the following sparse warning on s390: arch/s390/kernel/machine_kexec_file.c:333:5: warning: symbol 'arch_kexec_kernel_image_probe' was not declared. Should it be static? Signed-off-by: Vasily Gorbik --- include/linux/kexec.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 1740fe36b5b7..f7529d120920 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -183,6 +183,8 @@ int kexec_purgatory_get_set_symbol(struct kimage *image, const char *name, bool get_value); void *kexec_purgatory_get_symbol_addr(struct kimage *image, const char *name); +int __weak arch_kexec_kernel_image_probe(struct kimage *image, void *buf, + unsigned long buf_len); void * __weak arch_kexec_kernel_image_load(struct kimage *image); int __weak arch_kexec_apply_relocations_add(struct purgatory_info *pi, Elf_Shdr *section, -- 2.21.0