Permalink
Browse files

Fix merge error.

  • Loading branch information...
ad
ad committed Jan 2, 2008
1 parent c9d0c8f commit 8e7af4163e10aba428b024d95f1b0222339c0a71
Showing with 4 additions and 3 deletions.
  1. +4 −3 sys/uvm/uvm_map.c
View
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_map.c,v 1.246.2.5 2007/12/28 14:33:13 ad Exp $ */
+/* $NetBSD: uvm_map.c,v 1.246.2.6 2008/01/02 10:12:28 ad Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.246.2.5 2007/12/28 14:33:13 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.246.2.6 2008/01/02 10:12:28 ad Exp $");
#include "opt_ddb.h"
#include "opt_uvmhist.h"
@@ -4529,7 +4529,8 @@ uvm_kmapent_alloc(struct vm_map *map, int flags)
goto again;
}
- error = uvm_map_prepare(map, 0, PAGE_SIZE, NULL, 0, 0, mapflags, &args);
+ error = uvm_map_prepare(map, 0, PAGE_SIZE, NULL, UVM_UNKNOWN_OFFSET,
+ 0, mapflags, &args);
if (error) {
uvm_pagefree(pg);
return NULL;

0 comments on commit 8e7af41

Please sign in to comment.