diff options
| author | kib <kib@FreeBSD.org> | 2016-09-25 17:57:52 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2016-09-25 17:57:52 +0000 |
| commit | 5216d5b618db5b7d901e33f09c4ec0849822187f (patch) | |
| tree | 66e2aad055a8409e6e21d43b8b0d0592da22a880 | |
| parent | 982dc8585e4c5d4995a724a327299dcfb53ff44f (diff) | |
| download | FreeBSD-src-5216d5b618db5b7d901e33f09c4ec0849822187f.zip FreeBSD-src-5216d5b618db5b7d901e33f09c4ec0849822187f.tar.gz | |
MFC r305942:
Consolidate four efi_next_descriptor() definitions.
| -rw-r--r-- | sbin/sysctl/sysctl.c | 3 | ||||
| -rw-r--r-- | sys/amd64/amd64/machdep.c | 3 | ||||
| -rw-r--r-- | sys/arm/arm/machdep.c | 3 | ||||
| -rw-r--r-- | sys/arm64/arm64/machdep.c | 3 | ||||
| -rw-r--r-- | sys/sys/efi.h | 3 |
5 files changed, 3 insertions, 12 deletions
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c index f2d42a8..d9bd94d 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -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) { diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index e350fcb..05b75dd 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1064,9 +1064,6 @@ bios_add_smap_entries(struct bios_smap *smapbase, u_int32_t smapsize, } } -#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) diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c index 1a584fe..da334a8 100644 --- a/sys/arm/arm/machdep.c +++ b/sys/arm/arm/machdep.c @@ -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) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index dd2186b..b671753 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -690,9 +690,6 @@ add_fdt_mem_regions(struct mem_region *mr, int mrcnt, vm_paddr_t *physmap, } #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) diff --git a/sys/sys/efi.h b/sys/sys/efi.h index a4ffeb0..2d73d89 100644 --- a/sys/sys/efi.h +++ b/sys/sys/efi.h @@ -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 */ |
