Module Name: src
Committed By: rmind
Date: Sat Mar 28 21:34:18 UTC 2009
Modified Files:
src/sys/arch/amd64/amd64: vm_machdep.c
src/sys/arch/i386/i386: vm_machdep.c
src/sys/arch/x86/include: cpu.h
Log Message:
kvtop: change return type to paddr_t.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/amd64/amd64/vm_machdep.c
cvs rdiff -u -r1.143 -r1.144 src/sys/arch/i386/i386/vm_machdep.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x86/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/vm_machdep.c
diff -u src/sys/arch/amd64/amd64/vm_machdep.c:1.37 src/sys/arch/amd64/amd64/vm_machdep.c:1.38
--- src/sys/arch/amd64/amd64/vm_machdep.c:1.37 Sat Dec 20 12:42:36 2008
+++ src/sys/arch/amd64/amd64/vm_machdep.c Sat Mar 28 21:34:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.37 2008/12/20 12:42:36 ad Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.38 2009/03/28 21:34:17 rmind Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.37 2008/12/20 12:42:36 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.38 2009/03/28 21:34:17 rmind Exp $");
#include "opt_user_ldt.h"
@@ -269,14 +269,15 @@
/*
* Convert kernel VA to physical address
*/
-int
+paddr_t
kvtop(void *addr)
{
paddr_t pa;
+ bool ret;
- if (pmap_extract(pmap_kernel(), (vaddr_t)addr, &pa) == false)
- panic("kvtop: zero page frame");
- return((int)pa);
+ ret = pmap_extract(pmap_kernel(), (vaddr_t)addr, &pa);
+ KASSERT(ret == true);
+ return pa;
}
/*
Index: src/sys/arch/i386/i386/vm_machdep.c
diff -u src/sys/arch/i386/i386/vm_machdep.c:1.143 src/sys/arch/i386/i386/vm_machdep.c:1.144
--- src/sys/arch/i386/i386/vm_machdep.c:1.143 Sat Dec 20 13:09:44 2008
+++ src/sys/arch/i386/i386/vm_machdep.c Sat Mar 28 21:34:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.143 2008/12/20 13:09:44 ad Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.144 2009/03/28 21:34:17 rmind Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.143 2008/12/20 13:09:44 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.144 2009/03/28 21:34:17 rmind Exp $");
#include "opt_user_ldt.h"
#include "opt_mtrr.h"
@@ -277,14 +277,15 @@
/*
* Convert kernel VA to physical address
*/
-int
-kvtop(register void *addr)
+paddr_t
+kvtop(void *addr)
{
paddr_t pa;
+ bool ret;
- if (pmap_extract(pmap_kernel(), (vaddr_t)addr, &pa) == false)
- panic("kvtop: zero page frame");
- return (int)pa;
+ ret = pmap_extract(pmap_kernel(), (vaddr_t)addr, &pa);
+ KASSERT(ret == true);
+ return pa;
}
/*
Index: src/sys/arch/x86/include/cpu.h
diff -u src/sys/arch/x86/include/cpu.h:1.12 src/sys/arch/x86/include/cpu.h:1.13
--- src/sys/arch/x86/include/cpu.h:1.12 Fri Mar 27 16:07:37 2009
+++ src/sys/arch/x86/include/cpu.h Sat Mar 28 21:34:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.12 2009/03/27 16:07:37 dyoung Exp $ */
+/* $NetBSD: cpu.h,v 1.13 2009/03/28 21:34:17 rmind Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -372,7 +372,7 @@
void npxsave_cpu(bool);
/* vm_machdep.c */
-int kvtop(void *);
+paddr_t kvtop(void *);
#ifdef USER_LDT
/* sys_machdep.h */
