d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r263815, r263872:

Browse Source 
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
This commit is contained in:
emaste 2014-08-21 19:51:07 +00:00
parent a576189f8b
commit cb99f1dd80
12 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/ia64/acpica/OsdEnvironment.c
View File

@ -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>

2
sys/ia64/ia64/clock.c
View File

@ -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>

2
sys/ia64/ia64/dump_machdep.c
View File

@ -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>

2
sys/ia64/ia64/efi.c
View File

@ -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>

2
sys/ia64/ia64/iodev_machdep.c
View File

@ -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);

2
sys/ia64/ia64/machdep.c
View File

@ -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>

2
sys/ia64/ia64/mem.c
View File

@ -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>

2
sys/ia64/ia64/nexus.c
View File

@ -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>

2
sys/ia64/ia64/pmap.c
View File

@ -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>

2
sys/ia64/ia64/sal.c
View File

@ -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>

2
sys/ia64/ia64/trap.c
View File

@ -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>

10
sys/ia64/include/efi.h → sys/sys/efi.h
View File

@ -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_ */