svn commit: r306316 - in stable/11: sbin/sysctl sys/amd64/amd64 sys/arm/arm sys/arm64/arm64 sys/sys
Konstantin Belousov
kib at FreeBSD.org
Sun Sep 25 17:57:54 UTC 2016
Author: kib
Date: Sun Sep 25 17:57:52 2016
New Revision: 306316
URL: https://svnweb.freebsd.org/changeset/base/306316
Log:
MFC r305942:
Consolidate four efi_next_descriptor() definitions.
Modified:
stable/11/sbin/sysctl/sysctl.c
stable/11/sys/amd64/amd64/machdep.c
stable/11/sys/arm/arm/machdep.c
stable/11/sys/arm64/arm64/machdep.c
stable/11/sys/sys/efi.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sbin/sysctl/sysctl.c
==============================================================================
--- stable/11/sbin/sysctl/sysctl.c Sun Sep 25 17:55:53 2016 (r306315)
+++ stable/11/sbin/sysctl/sysctl.c Sun Sep 25 17:57:52 2016 (r306316)
@@ -637,9 +637,6 @@ S_vmtotal(size_t l2, void *p)
}
#ifdef __amd64__
-#define efi_next_descriptor(ptr, size) \
- ((struct efi_md *)(((uint8_t *) ptr) + size))
-
static int
S_efi_map(size_t l2, void *p)
{
Modified: stable/11/sys/amd64/amd64/machdep.c
==============================================================================
--- stable/11/sys/amd64/amd64/machdep.c Sun Sep 25 17:55:53 2016 (r306315)
+++ stable/11/sys/amd64/amd64/machdep.c Sun Sep 25 17:57:52 2016 (r306316)
@@ -1064,9 +1064,6 @@ bios_add_smap_entries(struct bios_smap *
}
}
-#define efi_next_descriptor(ptr, size) \
- ((struct efi_md *)(((uint8_t *) ptr) + size))
-
static void
add_efi_map_entries(struct efi_map_header *efihdr, vm_paddr_t *physmap,
int *physmap_idx)
Modified: stable/11/sys/arm/arm/machdep.c
==============================================================================
--- stable/11/sys/arm/arm/machdep.c Sun Sep 25 17:55:53 2016 (r306315)
+++ stable/11/sys/arm/arm/machdep.c Sun Sep 25 17:57:52 2016 (r306316)
@@ -1398,9 +1398,6 @@ set_stackptrs(int cpu)
#endif
#ifdef EFI
-#define efi_next_descriptor(ptr, size) \
- ((struct efi_md *)(((uint8_t *) ptr) + size))
-
static void
add_efi_map_entries(struct efi_map_header *efihdr, struct mem_region *mr,
int *mrcnt)
Modified: stable/11/sys/arm64/arm64/machdep.c
==============================================================================
--- stable/11/sys/arm64/arm64/machdep.c Sun Sep 25 17:55:53 2016 (r306315)
+++ stable/11/sys/arm64/arm64/machdep.c Sun Sep 25 17:57:52 2016 (r306316)
@@ -690,9 +690,6 @@ add_fdt_mem_regions(struct mem_region *m
}
#endif
-#define efi_next_descriptor(ptr, size) \
- ((struct efi_md *)(((uint8_t *) ptr) + size))
-
static void
add_efi_map_entries(struct efi_map_header *efihdr, vm_paddr_t *physmap,
u_int *physmap_idxp)
Modified: stable/11/sys/sys/efi.h
==============================================================================
--- stable/11/sys/sys/efi.h Sun Sep 25 17:55:53 2016 (r306315)
+++ stable/11/sys/sys/efi.h Sun Sep 25 17:57:52 2016 (r306316)
@@ -85,6 +85,9 @@ struct efi_md {
#define EFI_MD_ATTR_RT 0x8000000000000000UL
};
+#define efi_next_descriptor(ptr, size) \
+ ((struct efi_md *)(((uint8_t *)(ptr)) + (size)))
+
struct efi_tm {
uint16_t tm_year; /* 1998 - 20XX */
uint8_t tm_mon; /* 1 - 12 */
More information about the svn-src-all
mailing list