From 2c38d78e41ae4078359acfbbdac1c39976733bbf Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Sun, 11 Apr 2004 04:26:58 +0000 Subject: [PATCH] - is_physical_memory()'s parameter, which is a physical address, should be a vm_paddr_t not a vm_offset_t. --- sys/amd64/amd64/vm_machdep.c | 3 +-- sys/amd64/include/md_var.h | 2 +- sys/i386/i386/vm_machdep.c | 3 +-- sys/i386/include/md_var.h | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c index b784368f09e..27047cb6268 100644 --- a/sys/amd64/amd64/vm_machdep.c +++ b/sys/amd64/amd64/vm_machdep.c @@ -522,8 +522,7 @@ swi_vm(void *dummy) */ int -is_physical_memory(addr) - vm_offset_t addr; +is_physical_memory(vm_paddr_t addr) { #ifdef DEV_ISA diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h index d1c3a40eba8..38c18b63d83 100644 --- a/sys/amd64/include/md_var.h +++ b/sys/amd64/include/md_var.h @@ -66,7 +66,7 @@ void doreti_iret_fault(void) __asm(__STRING(doreti_iret_fault)); void enable_sse(void); void fillw(int /*u_short*/ pat, void *base, size_t cnt); void fpstate_drop(struct thread *td); -int is_physical_memory(vm_offset_t addr); +int is_physical_memory(vm_paddr_t addr); int isa_nmi(int cd); void pagecopy(void *from, void *to); void pagezero(void *addr); diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c index 06e4ed41d56..0f1fd68370c 100644 --- a/sys/i386/i386/vm_machdep.c +++ b/sys/i386/i386/vm_machdep.c @@ -691,8 +691,7 @@ swi_vm(void *dummy) */ int -is_physical_memory(addr) - vm_offset_t addr; +is_physical_memory(vm_paddr_t addr) { #ifdef DEV_ISA diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h index 61da3598179..42bc19a15e4 100644 --- a/sys/i386/include/md_var.h +++ b/sys/i386/include/md_var.h @@ -95,7 +95,7 @@ int i586_copyout(const void *kaddr, void *udaddr, size_t len); void i686_pagezero(void *addr); void sse2_pagezero(void *addr); void init_AMD_Elan_sc520(void); -int is_physical_memory(vm_offset_t addr); +int is_physical_memory(vm_paddr_t addr); int isa_nmi(int cd); vm_paddr_t kvtop(void *addr); void setidt(int idx, alias_for_inthand_t *func, int typ, int dpl, int selec);