Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756819AbeAIOXi (ORCPT + 1 other); Tue, 9 Jan 2018 09:23:38 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:34274 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752397AbeAIOXZ (ORCPT ); Tue, 9 Jan 2018 09:23:25 -0500 From: Daniel Kiper To: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org, xen-devel@lists.xenproject.org Cc: ard.biesheuvel@linaro.org, boris.ostrovsky@oracle.com, hpa@zytor.com, jgross@suse.com, konrad.wilk@oracle.com, mingo@redhat.com, tglx@linutronix.de Subject: [PATCH 4/4] efi: Rename efi_get_secureboot() to __efi_get_secureboot() and make it static Date: Tue, 9 Jan 2018 15:22:25 +0100 Message-Id: <1515507745-17391-5-git-send-email-daniel.kiper@oracle.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1515507745-17391-1-git-send-email-daniel.kiper@oracle.com> References: <1515507745-17391-1-git-send-email-daniel.kiper@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8768 signatures=668652 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=882 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1801090203 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: This may help compiler to do some function call optimization. This is rather cosmetic. If you like this patch apply. If you do not you may ignore it. Signed-off-by: Daniel Kiper --- arch/x86/xen/efi.c | 2 +- drivers/firmware/efi/libstub/secureboot-core.c | 2 +- drivers/firmware/efi/libstub/secureboot.c | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/x86/xen/efi.c b/arch/x86/xen/efi.c index 5ad2b8f..d45677f 100644 --- a/arch/x86/xen/efi.c +++ b/arch/x86/xen/efi.c @@ -141,7 +141,7 @@ void __init xen_efi_init(void) boot_params.efi_info.efi_systab = (__u32)__pa(efi_systab_xen); boot_params.efi_info.efi_systab_hi = (__u32)(__pa(efi_systab_xen) >> 32); - boot_params.secure_boot = efi_get_secureboot(efi_systab_xen); + boot_params.secure_boot = __efi_get_secureboot(efi_systab_xen); set_bit(EFI_BOOT, &efi.flags); set_bit(EFI_PARAVIRT, &efi.flags); diff --git a/drivers/firmware/efi/libstub/secureboot-core.c b/drivers/firmware/efi/libstub/secureboot-core.c index d503ee4..07526a6 100644 --- a/drivers/firmware/efi/libstub/secureboot-core.c +++ b/drivers/firmware/efi/libstub/secureboot-core.c @@ -28,7 +28,7 @@ /* * Determine whether we're in secure boot mode. */ -enum __sb_init efi_secureboot_mode efi_get_secureboot(efi_system_table_t *sys_table_arg) +static enum __sb_init efi_secureboot_mode __efi_get_secureboot(efi_system_table_t *sys_table_arg) { u32 attr; u8 secboot, setupmode, moksbstate; diff --git a/drivers/firmware/efi/libstub/secureboot.c b/drivers/firmware/efi/libstub/secureboot.c index 1142170..f872afd 100644 --- a/drivers/firmware/efi/libstub/secureboot.c +++ b/drivers/firmware/efi/libstub/secureboot.c @@ -23,3 +23,8 @@ __VA_ARGS__); #include "secureboot-core.c" + +enum efi_secureboot_mode efi_get_secureboot(efi_system_table_t *sys_table_arg) +{ + return __efi_get_secureboot(sys_table_arg); +} -- 1.7.10.4