Page MenuHomeFreeBSD
Files F110639161

D45319.diff
No OneTemporary
Actions

D45319.diff
View Options

diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c
--- a/sys/arm/arm/machdep.c
+++ b/sys/arm/arm/machdep.c
@@ -551,7 +551,7 @@
/* Establish static device mappings. */
err_devmap = platform_devmap_init();
- devmap_bootstrap(0, NULL);
+ devmap_bootstrap();
vm_max_kernel_address = platform_lastaddr();
/*
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
@@ -996,7 +996,7 @@
physmem_init_kernel_globals();
- devmap_bootstrap(0, NULL);
+ devmap_bootstrap();
valid = bus_probe();
diff --git a/sys/kern/subr_devmap.c b/sys/kern/subr_devmap.c
--- a/sys/kern/subr_devmap.c
+++ b/sys/kern/subr_devmap.c
@@ -165,28 +165,19 @@
/*
* Map all of the static regions in the devmap table, and remember the devmap
* table so the mapdev, ptov, and vtop functions can do lookups later.
- *
- * If a non-NULL table pointer is given it is used unconditionally, otherwise
- * the previously-registered table is used. This smooths transition from legacy
- * code that fills in a local table then calls this function passing that table,
- * and newer code that uses devmap_register_table() in platform-specific
- * code, then lets the common platform-specific init function call this function
- * with a NULL pointer.
*/
void
-devmap_bootstrap(vm_offset_t l1pt, const struct devmap_entry *table)
+devmap_bootstrap(void)
{
const struct devmap_entry *pd;
devmap_bootstrap_done = true;
/*
- * If given a table pointer, use it. Otherwise, if a table was
- * previously registered, use it. Otherwise, no work to do.
+ * If a table was previously registered, use it. Otherwise, no work to
+ * do.
*/
- if (table != NULL)
- devmap_table = table;
- else if (devmap_table == NULL)
+ if (devmap_table == NULL)
return;
for (pd = devmap_table; pd->pd_size != 0; ++pd) {
diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c
--- a/sys/riscv/riscv/machdep.c
+++ b/sys/riscv/riscv/machdep.c
@@ -568,7 +568,7 @@
physmem_init_kernel_globals();
/* Establish static device mappings */
- devmap_bootstrap(0, NULL);
+ devmap_bootstrap();
cninit();
diff --git a/sys/sys/devmap.h b/sys/sys/devmap.h
--- a/sys/sys/devmap.h
+++ b/sys/sys/devmap.h
@@ -71,11 +71,10 @@
* Establish mappings for all the entries in the table. This is called
* automatically from the common platform-specific init function in
* <ARCH>/machdep.c, and also from the custom platform-specific init routines
- * in older code. If the table pointer is NULL, this will use the table
- * installed previously by devmap_register_table().
+ * in older code. This function only has an effect when a table was installed
+ * previously by devmap_register_table().
*/
-void devmap_bootstrap(vm_offset_t _l1pt,
- const struct devmap_entry *_table);
+void devmap_bootstrap(void);
/*
* Translate between virtual and physical addresses within a region that is

File Metadata

Mime Type
text/plain
Expires
Sat, Feb 22, 7:25 AM (12 m, 17 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16767515
Default Alt Text
D45319.diff (2 KB)

Event Timeline