Module Name: src
Committed By: kre
Date: Thu Nov 15 11:20:59 UTC 2018
Modified Files:
src/sys/arch/x86/x86: efi.c
Log Message:
Update signature in prototype of efi_relva() to match
change in definition in previous, and explicitly cast
NULL to paddr_t to avoid gcc noise.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/x86/x86/efi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/efi.c
diff -u src/sys/arch/x86/x86/efi.c:1.16 src/sys/arch/x86/x86/efi.c:1.17
--- src/sys/arch/x86/x86/efi.c:1.16 Thu Nov 15 04:59:02 2018
+++ src/sys/arch/x86/x86/efi.c Thu Nov 15 11:20:59 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: efi.c,v 1.16 2018/11/15 04:59:02 riastradh Exp $ */
+/* $NetBSD: efi.c,v 1.17 2018/11/15 11:20:59 kre Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: efi.c,v 1.16 2018/11/15 04:59:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efi.c,v 1.17 2018/11/15 11:20:59 kre Exp $");
#include <sys/kmem.h>
#include <sys/param.h>
@@ -48,14 +48,14 @@ const struct uuid EFI_UUID_SMBIOS = EFI_
const struct uuid EFI_UUID_SMBIOS3 = EFI_TABLE_SMBIOS3;
static vaddr_t efi_getva(paddr_t);
-static void efi_relva(vaddr_t);
+static void efi_relva(paddr_t, vaddr_t);
struct efi_cfgtbl *efi_getcfgtblhead(void);
void efi_aprintcfgtbl(void);
void efi_aprintuuid(const struct uuid *);
bool efi_uuideq(const struct uuid *, const struct uuid *);
static bool efi_is32x64 = false;
-static paddr_t efi_systbl_pa = NULL;
+static paddr_t efi_systbl_pa = (paddr_t)NULL;
static struct efi_systbl *efi_systbl_va = NULL;
static struct efi_cfgtbl *efi_cfgtblhead_va = NULL;
static struct efi_e820memmap {
