Sat Oct 30 05:56:01 2010 UTC ()
Put back #include <uvm/uvm_page.h> for now, to avoid build erros.

This should be removed again later, because exposing page-level
definitions out of UVM is totally unnecessary.


(uebayasi)
diff -r1.161.2.8 -r1.161.2.9 src/sys/uvm/uvm_extern.h

cvs diff -r1.161.2.8 -r1.161.2.9 src/sys/uvm/uvm_extern.h (expand / switch to unified diff)

--- src/sys/uvm/uvm_extern.h 2010/07/26 10:11:39 1.161.2.8
+++ src/sys/uvm/uvm_extern.h 2010/10/30 05:56:00 1.161.2.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: uvm_extern.h,v 1.161.2.8 2010/07/26 10:11:39 uebayasi Exp $ */ 1/* $NetBSD: uvm_extern.h,v 1.161.2.9 2010/10/30 05:56:00 uebayasi Exp $ */
2 2
3/* 3/*
4 * 4 *
5 * Copyright (c) 1997 Charles D. Cranor and Washington University. 5 * Copyright (c) 1997 Charles D. Cranor and Washington University.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -466,26 +466,27 @@ struct uvmexp_sysctl { @@ -466,26 +466,27 @@ struct uvmexp_sysctl {
466#ifdef _KERNEL 466#ifdef _KERNEL
467/* we need this before including uvm_page.h on some platforms */ 467/* we need this before including uvm_page.h on some platforms */
468extern struct uvmexp uvmexp; 468extern struct uvmexp uvmexp;
469#endif 469#endif
470 470
471/* 471/*
472 * Finally, bring in standard UVM headers. 472 * Finally, bring in standard UVM headers.
473 */ 473 */
474#include <sys/vmmeter.h> 474#include <sys/vmmeter.h>
475#include <sys/queue.h> 475#include <sys/queue.h>
476#include <sys/lock.h> 476#include <sys/lock.h>
477#include <uvm/uvm_param.h> 477#include <uvm/uvm_param.h>
478#include <uvm/uvm_prot.h> 478#include <uvm/uvm_prot.h>
 479#include <uvm/uvm_page.h>
479#include <uvm/uvm_pmap.h> 480#include <uvm/uvm_pmap.h>
480#include <uvm/uvm_map.h> 481#include <uvm/uvm_map.h>
481#include <uvm/uvm_pager.h> 482#include <uvm/uvm_pager.h>
482 483
483/* 484/*
484 * helpers for calling ubc_release() 485 * helpers for calling ubc_release()
485 */ 486 */
486#ifdef PMAP_CACHE_VIVT 487#ifdef PMAP_CACHE_VIVT
487#define UBC_WANT_UNMAP(vp) (((vp)->v_iflag & VI_TEXT) != 0) 488#define UBC_WANT_UNMAP(vp) (((vp)->v_iflag & VI_TEXT) != 0)
488#else 489#else
489#define UBC_WANT_UNMAP(vp) false 490#define UBC_WANT_UNMAP(vp) false
490#endif 491#endif
491#define UBC_UNMAP_FLAG(vp) (UBC_WANT_UNMAP(vp) ? UBC_UNMAP : 0) 492#define UBC_UNMAP_FLAG(vp) (UBC_WANT_UNMAP(vp) ? UBC_UNMAP : 0)