Fix i386 buildkernel.
authorSascha Wildner <saw@online.de>
Fri, 28 Oct 2011 12:30:41 +0000 (14:30 +0200)
committerSascha Wildner <saw@online.de>
Fri, 28 Oct 2011 12:30:41 +0000 (14:30 +0200)
sys/platform/pc32/i386/pmap.c
sys/vm/vm_page.c

index a06fc78..edddba3 100644 (file)
@@ -42,7 +42,6 @@
  *
  *     from:   @(#)pmap.c      7.7 (Berkeley)  5/12/91
  * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.250.2.18 2002/03/06 22:48:53 silby Exp $
- * $DragonFly: src/sys/platform/pc32/i386/pmap.c,v 1.87 2008/08/25 17:01:38 dillon Exp $
  */
 
 /*
@@ -1347,7 +1346,7 @@ pmap_release_free_page(struct pmap *pmap, vm_page_t p)
 static vm_page_t
 _pmap_allocpte(pmap_t pmap, unsigned ptepindex)
 {
-       vm_offset_t pteva, ptepa;
+       vm_offset_t ptepa;
        vm_page_t m;
 
        /*
index 87e8e6c..c113d77 100644 (file)
@@ -87,6 +87,7 @@
 #include <vm/vm_extern.h>
 #include <vm/swap_pager.h>
 
+#include <machine/inttypes.h>
 #include <machine/md_var.h>
 
 #include <vm/vm_page2.h>
@@ -1000,7 +1001,7 @@ vm_page_rename(vm_page_t m, vm_object_t new_object, vm_pindex_t new_pindex)
                vm_page_remove(m);
        }
        if (vm_page_insert(m, new_object, new_pindex) == FALSE) {
-               panic("vm_page_rename: target exists (%p,%ld)",
+               panic("vm_page_rename: target exists (%p,%"PRIu64")",
                      new_object, new_pindex);
        }
        if (m->queue - m->pc == PQ_CACHE)
@@ -1401,7 +1402,7 @@ loop:
         */
        if (object) {
                if (vm_page_insert(m, object, pindex) == FALSE) {
-                       kprintf("PAGE RACE (%p:%d,%ld)\n",
+                       kprintf("PAGE RACE (%p:%d,%"PRIu64")\n",
                                object, object->type, pindex);
                        vm_page_free(m);
                        m = NULL;