Page MenuHomeFreeBSD

D37439.diff
No OneTemporary

D37439.diff

diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c
--- a/sys/arm64/arm64/machdep.c
+++ b/sys/arm64/arm64/machdep.c
@@ -421,10 +421,10 @@
return (false);
}
-typedef void (*efi_map_entry_cb)(struct efi_md *);
+typedef void (*efi_map_entry_cb)(struct efi_md *, void *argp);
static void
-foreach_efi_map_entry(struct efi_map_header *efihdr, efi_map_entry_cb cb)
+foreach_efi_map_entry(struct efi_map_header *efihdr, efi_map_entry_cb cb, void *argp)
{
struct efi_md *map, *p;
size_t efisz;
@@ -443,12 +443,12 @@
for (i = 0, p = map; i < ndesc; i++,
p = efi_next_descriptor(p, efihdr->descriptor_size)) {
- cb(p);
+ cb(p, argp);
}
}
static void
-exclude_efi_map_entry(struct efi_md *p)
+exclude_efi_map_entry(struct efi_md *p, void *argp __unused)
{
switch (p->md_type) {
@@ -471,11 +471,11 @@
exclude_efi_map_entries(struct efi_map_header *efihdr)
{
- foreach_efi_map_entry(efihdr, exclude_efi_map_entry);
+ foreach_efi_map_entry(efihdr, exclude_efi_map_entry, NULL);
}
static void
-add_efi_map_entry(struct efi_md *p)
+add_efi_map_entry(struct efi_md *p, void *argp __unused)
{
switch (p->md_type) {
@@ -513,12 +513,11 @@
static void
add_efi_map_entries(struct efi_map_header *efihdr)
{
-
- foreach_efi_map_entry(efihdr, add_efi_map_entry);
+ foreach_efi_map_entry(efihdr, add_efi_map_entry, NULL);
}
static void
-print_efi_map_entry(struct efi_md *p)
+print_efi_map_entry(struct efi_md *p, void *argp __unused)
{
const char *type;
static const char *types[] = {
@@ -578,7 +577,7 @@
printf("%23s %12s %12s %8s %4s\n",
"Type", "Physical", "Virtual", "#Pages", "Attr");
- foreach_efi_map_entry(efihdr, print_efi_map_entry);
+ foreach_efi_map_entry(efihdr, print_efi_map_entry, NULL);
}
#ifdef FDT

File Metadata

Mime Type
text/plain
Expires
Thu, Jun 18, 1:28 AM (11 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34039080
Default Alt Text
D37439.diff (1 KB)

Event Timeline