MFC r263815, r263872:

  Move ia64 efi.h to sys in preparation for amd64 UEFI support

    Prototypes specific to ia64 have been left in this file for now, under
    __ia64__, rather than moving them to a new header under sys/ia64.
    I anticipate that (some of) the corresponding functions will be shared
    by the amd64, arm64, i386, and ia64 architectures, and we can adjust
    this as EFI support on other than ia64 continues to develop.

  Fix missed efi.h header change in r263815

Sponsored by:	The FreeBSD Foundation

12 files changed, 16 insertions, 16 deletions

diff --git a/sys/ia64/acpica/OsdEnvironment.c b/sys/ia64/acpica/OsdEnvironment.c
index 60f2bb2..7aa281f 100644
--- a/sys/ia64/acpica/OsdEnvironment.c
+++ b/sys/ia64/acpica/OsdEnvironment.c
@@ -29,8 +29,8 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
+#include <sys/efi.h>
 #include <sys/sysctl.h>
-#include <machine/efi.h>
 
 #include <contrib/dev/acpica/include/acpi.h>
 
diff --git a/sys/ia64/ia64/clock.c b/sys/ia64/ia64/clock.c
index 68dc29b..4a672be 100644
--- a/sys/ia64/ia64/clock.c
+++ b/sys/ia64/ia64/clock.c
@@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
+#include <sys/efi.h>
 #include <sys/interrupt.h>
 #include <sys/priority.h>
 #include <sys/proc.h>
@@ -41,7 +42,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/pcpu.h>
 
 #include <machine/cpu.h>
-#include <machine/efi.h>
 #include <machine/intr.h>
 #include <machine/intrcnt.h>
 #include <machine/md_var.h>
diff --git a/sys/ia64/ia64/dump_machdep.c b/sys/ia64/ia64/dump_machdep.c
index 6a07491..9a058bb 100644
--- a/sys/ia64/ia64/dump_machdep.c
+++ b/sys/ia64/ia64/dump_machdep.c
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/cons.h>
+#include <sys/efi.h>
 #include <sys/kernel.h>
 #include <sys/kerneldump.h>
 #ifdef SW_WATCHDOG
@@ -41,7 +42,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <machine/bootinfo.h>
-#include <machine/efi.h>
 #include <machine/elf.h>
 #include <machine/md_var.h>
 
diff --git a/sys/ia64/ia64/efi.c b/sys/ia64/ia64/efi.c
index 32868a0..55adb67 100644
--- a/sys/ia64/ia64/efi.c
+++ b/sys/ia64/ia64/efi.c
@@ -29,9 +29,9 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/efi.h>
 #include <sys/systm.h>
 #include <machine/bootinfo.h>
-#include <machine/efi.h>
 #include <machine/md_var.h>
 #include <machine/sal.h>
 #include <vm/vm.h>
diff --git a/sys/ia64/ia64/iodev_machdep.c b/sys/ia64/ia64/iodev_machdep.c
index 9d9057d..a5aaf9f 100644
--- a/sys/ia64/ia64/iodev_machdep.c
+++ b/sys/ia64/ia64/iodev_machdep.c
@@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/conf.h>
+#include <sys/efi.h>
 #include <sys/fcntl.h>
 #include <sys/ioccom.h>
 #include <sys/malloc.h>
@@ -37,7 +38,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 
 #include <machine/bus.h>
-#include <machine/efi.h>
 #include <machine/iodev.h>
 
 static int iodev_efivar_getvar(struct iodev_efivar_req *req);
diff --git a/sys/ia64/ia64/machdep.c b/sys/ia64/ia64/machdep.c
index bccfcd1..46357d1 100644
--- a/sys/ia64/ia64/machdep.c
+++ b/sys/ia64/ia64/machdep.c
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/cons.h>
 #include <sys/cpu.h>
+#include <sys/efi.h>
 #include <sys/eventhandler.h>
 #include <sys/exec.h>
 #include <sys/imgact.h>
@@ -83,7 +84,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bootinfo.h>
 #include <machine/cpu.h>
-#include <machine/efi.h>
 #include <machine/elf.h>
 #include <machine/fpu.h>
 #include <machine/intr.h>
diff --git a/sys/ia64/ia64/mem.c b/sys/ia64/ia64/mem.c
index 253e5d4..6faf437 100644
--- a/sys/ia64/ia64/mem.c
+++ b/sys/ia64/ia64/mem.c
@@ -45,13 +45,13 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/conf.h>
+#include <sys/efi.h>
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/memrange.h>
 #include <sys/systm.h>
 #include <sys/uio.h>
-#include <machine/efi.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
diff --git a/sys/ia64/ia64/nexus.c b/sys/ia64/ia64/nexus.c
index c232d39..a4d3e24 100644
--- a/sys/ia64/ia64/nexus.c
+++ b/sys/ia64/ia64/nexus.c
@@ -44,6 +44,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/clock.h>
+#include <sys/efi.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
@@ -55,7 +56,6 @@
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#include <machine/efi.h>
 #include <machine/intr.h>
 #include <machine/pmap.h>
 #include <machine/resource.h>
diff --git a/sys/ia64/ia64/pmap.c b/sys/ia64/ia64/pmap.c
index f84c706..3fb437c 100644
--- a/sys/ia64/ia64/pmap.c
+++ b/sys/ia64/ia64/pmap.c
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_pmap.h"
 
 #include <sys/param.h>
+#include <sys/efi.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>
@@ -71,7 +72,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/uma.h>
 
 #include <machine/bootinfo.h>
-#include <machine/efi.h>
 #include <machine/md_var.h>
 #include <machine/pal.h>
 
diff --git a/sys/ia64/ia64/sal.c b/sys/ia64/ia64/sal.c
index 249113c..b0fe070 100644
--- a/sys/ia64/ia64/sal.c
+++ b/sys/ia64/ia64/sal.c
@@ -30,11 +30,11 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
+#include <sys/efi.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
-#include <machine/efi.h>
 #include <machine/intr.h>
 #include <machine/md_var.h>
 #include <machine/sal.h>
diff --git a/sys/ia64/ia64/trap.c b/sys/ia64/ia64/trap.c
index 8e4b953..987b144d 100644
--- a/sys/ia64/ia64/trap.c
+++ b/sys/ia64/ia64/trap.c
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysproto.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
+#include <sys/efi.h>
 #include <sys/exec.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
@@ -60,7 +61,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/reg.h>
 #include <machine/pal.h>
 #include <machine/fpu.h>
-#include <machine/efi.h>
 #include <machine/pcb.h>
 #ifdef SMP
 #include <machine/smp.h>
diff --git a/sys/ia64/include/efi.h b/sys/sys/efi.h
index 02bef10..749f094 100644
--- a/sys/ia64/include/efi.h
+++ b/sys/sys/efi.h
@@ -26,8 +26,8 @@
  * $FreeBSD$
  */
 
-#ifndef _MACHINE_EFI_H_
-#define _MACHINE_EFI_H_
+#ifndef _SYS_EFI_H_
+#define _SYS_EFI_H_
 
 #include <sys/uuid.h>
 
@@ -151,7 +151,7 @@ struct efi_systbl {
 	uint64_t	st_cfgtbl;
 };
 
-#ifdef _KERNEL
+#if defined(_KERNEL) && defined(__ia64__)
 
 typedef u_long (*ia64_efi_f)(u_long, u_long, u_long, u_long);
 
@@ -172,6 +172,6 @@ int efi_var_get(efi_char *, struct uuid *, uint32_t *, size_t *, void *);
 int efi_var_nextname(size_t *, efi_char *, struct uuid *);
 int efi_var_set(efi_char *, struct uuid *, uint32_t, size_t, void *);
 
-#endif /* _KERNEL */
+#endif /* _KERNEL && __ia64__ */
 
-#endif /* _MACHINE_EFI_H_ */
+#endif /* _SYS_EFI_H_ */