diff --git a/headers/private/drivers/poke.h b/headers/private/drivers/poke.h
index 334f55063c..fdbee2e988 100644
--- a/headers/private/drivers/poke.h
+++ b/headers/private/drivers/poke.h
@@ -60,7 +60,7 @@ typedef struct {
 	uint32		signature;
 	area_id		area;
 	const char*	name;
-	void*		physical_address;
+	phys_addr_t	physical_address;
 	size_t		size;
 	uint32		flags;
 	uint32		protection;
diff --git a/src/add-ons/kernel/drivers/misc/poke.cpp b/src/add-ons/kernel/drivers/misc/poke.cpp
index 536745726a..bfbcfaefe7 100644
--- a/src/add-ons/kernel/drivers/misc/poke.cpp
+++ b/src/add-ons/kernel/drivers/misc/poke.cpp
@@ -285,8 +285,7 @@ poke_control(void* cookie, uint32 op, void* arg, size_t length)
 				return B_BAD_VALUE;
 
 			result = get_memory_map(ioctl.address, ioctl.size, &table, 1);
-			ioctl.physical_address = (void*)(addr_t)table.address;
-				// TODO: mem_map_args::physical_address should be phys_addr_t!
+			ioctl.physical_address = table.address;
 			ioctl.size = table.size;
 			if (user_memcpy(arg, &ioctl, sizeof(mem_map_args)) != B_OK)
 				return B_BAD_ADDRESS;