device_pager.c (42408) | device_pager.c (42957) |
---|---|
1/* 2 * Copyright (c) 1990 University of Utah. 3 * Copyright (c) 1991, 1993 4 * The Regents of the University of California. All rights reserved. 5 * 6 * This code is derived from software contributed to Berkeley by 7 * the Systems Programming Group of the University of Utah Computer 8 * Science Department. --- 22 unchanged lines hidden (view full) --- 31 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 36 * SUCH DAMAGE. 37 * 38 * @(#)device_pager.c 8.1 (Berkeley) 6/11/93 | 1/* 2 * Copyright (c) 1990 University of Utah. 3 * Copyright (c) 1991, 1993 4 * The Regents of the University of California. All rights reserved. 5 * 6 * This code is derived from software contributed to Berkeley by 7 * the Systems Programming Group of the University of Utah Computer 8 * Science Department. --- 22 unchanged lines hidden (view full) --- 31 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 36 * SUCH DAMAGE. 37 * 38 * @(#)device_pager.c 8.1 (Berkeley) 6/11/93 |
39 * $Id: device_pager.c,v 1.36 1998/12/07 21:58:50 archie Exp $ | 39 * $Id: device_pager.c,v 1.37 1999/01/08 17:31:23 eivind Exp $ |
40 */ 41 42#include <sys/param.h> 43#include <sys/systm.h> 44#include <sys/conf.h> 45#include <sys/mman.h> 46#include <sys/malloc.h> 47 --- 147 unchanged lines hidden (view full) --- 195 vm_offset_t paddr; 196 vm_page_t page; 197 dev_t dev; 198 int i, s; 199 d_mmap_t *mapfunc; 200 int prot; 201 202 dev = (dev_t) (uintptr_t) object->handle; | 40 */ 41 42#include <sys/param.h> 43#include <sys/systm.h> 44#include <sys/conf.h> 45#include <sys/mman.h> 46#include <sys/malloc.h> 47 --- 147 unchanged lines hidden (view full) --- 195 vm_offset_t paddr; 196 vm_page_t page; 197 dev_t dev; 198 int i, s; 199 d_mmap_t *mapfunc; 200 int prot; 201 202 dev = (dev_t) (uintptr_t) object->handle; |
203 offset = m[reqpage]->pindex + OFF_TO_IDX(object->paging_offset); | 203 offset = m[reqpage]->pindex; |
204 prot = PROT_READ; /* XXX should pass in? */ 205 mapfunc = cdevsw[major(dev)]->d_mmap; 206 207 if (mapfunc == NULL || mapfunc == (d_mmap_t *)nullop) 208 panic("dev_pager_getpage: no map function"); 209 210 paddr = pmap_phys_address((*mapfunc) ((dev_t) dev, (vm_offset_t) offset << PAGE_SHIFT, prot)); 211 KASSERT(paddr != -1,("dev_pager_getpage: map function returns error")); --- 71 unchanged lines hidden --- | 204 prot = PROT_READ; /* XXX should pass in? */ 205 mapfunc = cdevsw[major(dev)]->d_mmap; 206 207 if (mapfunc == NULL || mapfunc == (d_mmap_t *)nullop) 208 panic("dev_pager_getpage: no map function"); 209 210 paddr = pmap_phys_address((*mapfunc) ((dev_t) dev, (vm_offset_t) offset << PAGE_SHIFT, prot)); 211 KASSERT(paddr != -1,("dev_pager_getpage: map function returns error")); --- 71 unchanged lines hidden --- |