Deleted Added
full compact
elf64_freebsd.c (292338) elf64_freebsd.c (293724)
1/*-
2 * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
3 * Copyright (c) 2014 The FreeBSD Foundation
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 12 unchanged lines hidden (view full) ---

21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 */
27
28#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
3 * Copyright (c) 2014 The FreeBSD Foundation
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 12 unchanged lines hidden (view full) ---

21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 */
27
28#include <sys/cdefs.h>
29__FBSDID("$FreeBSD: head/sys/boot/efi/loader/arch/amd64/elf64_freebsd.c 292338 2015-12-16 16:19:18Z emaste $");
29__FBSDID("$FreeBSD: head/sys/boot/efi/loader/arch/amd64/elf64_freebsd.c 293724 2016-01-12 02:17:39Z smh $");
30
31#define __ELF_WORD_SIZE 64
32#include <sys/param.h>
33#include <sys/exec.h>
34#include <sys/linker.h>
35#include <string.h>
36#include <machine/elf.h>
37#include <stand.h>

--- 57 unchanged lines hidden (view full) ---

95{
96 struct file_metadata *md;
97 Elf_Ehdr *ehdr;
98 vm_offset_t modulep, kernend, trampcode, trampstack;
99 int err, i;
100 ACPI_TABLE_RSDP *rsdp;
101 char buf[24];
102 int revision;
30
31#define __ELF_WORD_SIZE 64
32#include <sys/param.h>
33#include <sys/exec.h>
34#include <sys/linker.h>
35#include <string.h>
36#include <machine/elf.h>
37#include <stand.h>

--- 57 unchanged lines hidden (view full) ---

95{
96 struct file_metadata *md;
97 Elf_Ehdr *ehdr;
98 vm_offset_t modulep, kernend, trampcode, trampstack;
99 int err, i;
100 ACPI_TABLE_RSDP *rsdp;
101 char buf[24];
102 int revision;
103 EFI_STATUS status;
104
105 rsdp = efi_get_table(&acpi20_guid);
106 if (rsdp == NULL) {
107 rsdp = efi_get_table(&acpi_guid);
108 }
109 if (rsdp != NULL) {
110 sprintf(buf, "0x%016llx", (unsigned long long)rsdp);
111 setenv("hint.acpi.0.rsdp", buf, 1);

--- 78 unchanged lines hidden ---
103
104 rsdp = efi_get_table(&acpi20_guid);
105 if (rsdp == NULL) {
106 rsdp = efi_get_table(&acpi_guid);
107 }
108 if (rsdp != NULL) {
109 sprintf(buf, "0x%016llx", (unsigned long long)rsdp);
110 setenv("hint.acpi.0.rsdp", buf, 1);

--- 78 unchanged lines hidden ---