From owner-svn-src-head@FreeBSD.ORG Thu Mar 27 13:57:03 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BBB27D02; Thu, 27 Mar 2014 13:57:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9D2812D4; Thu, 27 Mar 2014 13:57:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2RDv3eG004624; Thu, 27 Mar 2014 13:57:03 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2RDv1h1004609; Thu, 27 Mar 2014 13:57:01 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201403271357.s2RDv1h1004609@svn.freebsd.org> From: Ed Maste Date: Thu, 27 Mar 2014 13:57:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r263815 - in head/sys: ia64/acpica ia64/ia64 ia64/include sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Mar 2014 13:57:03 -0000 Author: emaste Date: Thu Mar 27 13:57:00 2014 New Revision: 263815 URL: http://svnweb.freebsd.org/changeset/base/263815 Log: 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. Sponsored by: The FreeBSD Foundation Added: head/sys/sys/efi.h - copied, changed from r263814, head/sys/ia64/include/efi.h Deleted: head/sys/ia64/include/efi.h Modified: head/sys/ia64/acpica/OsdEnvironment.c head/sys/ia64/ia64/clock.c head/sys/ia64/ia64/dump_machdep.c head/sys/ia64/ia64/efi.c head/sys/ia64/ia64/iodev_machdep.c head/sys/ia64/ia64/machdep.c head/sys/ia64/ia64/nexus.c head/sys/ia64/ia64/pmap.c head/sys/ia64/ia64/sal.c head/sys/ia64/ia64/trap.c Modified: head/sys/ia64/acpica/OsdEnvironment.c ============================================================================== --- head/sys/ia64/acpica/OsdEnvironment.c Thu Mar 27 13:15:22 2014 (r263814) +++ head/sys/ia64/acpica/OsdEnvironment.c Thu Mar 27 13:57:00 2014 (r263815) @@ -29,8 +29,8 @@ __FBSDID("$FreeBSD$"); #include +#include #include -#include #include Modified: head/sys/ia64/ia64/clock.c ============================================================================== --- head/sys/ia64/ia64/clock.c Thu Mar 27 13:15:22 2014 (r263814) +++ head/sys/ia64/ia64/clock.c Thu Mar 27 13:57:00 2014 (r263815) @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -41,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include Modified: head/sys/ia64/ia64/dump_machdep.c ============================================================================== --- head/sys/ia64/ia64/dump_machdep.c Thu Mar 27 13:15:22 2014 (r263814) +++ head/sys/ia64/ia64/dump_machdep.c Thu Mar 27 13:57:00 2014 (r263815) @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #ifdef SW_WATCHDOG @@ -41,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: head/sys/ia64/ia64/efi.c ============================================================================== --- head/sys/ia64/ia64/efi.c Thu Mar 27 13:15:22 2014 (r263814) +++ head/sys/ia64/ia64/efi.c Thu Mar 27 13:57:00 2014 (r263815) @@ -29,9 +29,9 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include -#include #include #include #include Modified: head/sys/ia64/ia64/iodev_machdep.c ============================================================================== --- head/sys/ia64/ia64/iodev_machdep.c Thu Mar 27 13:15:22 2014 (r263814) +++ head/sys/ia64/ia64/iodev_machdep.c Thu Mar 27 13:57:00 2014 (r263815) @@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -37,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include static int iodev_efivar_getvar(struct iodev_efivar_req *req); Modified: head/sys/ia64/ia64/machdep.c ============================================================================== --- head/sys/ia64/ia64/machdep.c Thu Mar 27 13:15:22 2014 (r263814) +++ head/sys/ia64/ia64/machdep.c Thu Mar 27 13:57:00 2014 (r263815) @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -83,7 +84,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include Modified: head/sys/ia64/ia64/nexus.c ============================================================================== --- head/sys/ia64/ia64/nexus.c Thu Mar 27 13:15:22 2014 (r263814) +++ head/sys/ia64/ia64/nexus.c Thu Mar 27 13:57:00 2014 (r263815) @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -55,7 +56,6 @@ #include #include -#include #include #include #include Modified: head/sys/ia64/ia64/pmap.c ============================================================================== --- head/sys/ia64/ia64/pmap.c Thu Mar 27 13:15:22 2014 (r263814) +++ head/sys/ia64/ia64/pmap.c Thu Mar 27 13:57:00 2014 (r263815) @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include "opt_pmap.h" #include +#include #include #include #include @@ -71,7 +72,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include Modified: head/sys/ia64/ia64/sal.c ============================================================================== --- head/sys/ia64/ia64/sal.c Thu Mar 27 13:15:22 2014 (r263814) +++ head/sys/ia64/ia64/sal.c Thu Mar 27 13:57:00 2014 (r263815) @@ -30,11 +30,11 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include #include -#include #include #include #include Modified: head/sys/ia64/ia64/trap.c ============================================================================== --- head/sys/ia64/ia64/trap.c Thu Mar 27 13:15:22 2014 (r263814) +++ head/sys/ia64/ia64/trap.c Thu Mar 27 13:57:00 2014 (r263815) @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -60,7 +61,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #ifdef SMP #include Copied and modified: head/sys/sys/efi.h (from r263814, head/sys/ia64/include/efi.h) ============================================================================== --- head/sys/ia64/include/efi.h Thu Mar 27 13:15:22 2014 (r263814, copy source) +++ head/sys/sys/efi.h Thu Mar 27 13:57:00 2014 (r263815) @@ -26,8 +26,8 @@ * $FreeBSD$ */ -#ifndef _MACHINE_EFI_H_ -#define _MACHINE_EFI_H_ +#ifndef _SYS_EFI_H_ +#define _SYS_EFI_H_ #include @@ -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 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_ */