ia64/xen-unstable

changeset 573:4761636414af

bitkeeper revision 1.316 (3f0bfda37LUgsfDz9V4CKjViSQGZWQ)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/rac61/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/sos22/xeno.bk
author sos22@labyrinth.cl.cam.ac.uk
date Wed Jul 09 11:33:55 2003 +0000 (2003-07-09)
parents ddb65ffc61be d1c49d8a0744
children 0ddcd1aeb420
files xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c
line diff
     1.1 --- a/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c	Wed Jul 09 11:21:28 2003 +0000
     1.2 +++ b/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c	Wed Jul 09 11:33:55 2003 +0000
     1.3 @@ -32,6 +32,8 @@
     1.4  
     1.5  #include "dom0_ops.h"
     1.6  
     1.7 +#define MAP_DISCONT 1
     1.8 +
     1.9  /* Private proc-file data structures. */
    1.10  typedef struct proc_data {
    1.11      unsigned int domain;
    1.12 @@ -47,7 +49,7 @@ static struct proc_dir_entry *dom_list_i
    1.13  
    1.14  int direct_unmap(struct mm_struct *, unsigned long, unsigned long);
    1.15  unsigned long direct_mmap(unsigned long phys_addr, unsigned long size, 
    1.16 -			  pgprot_t prot, int tot_pages);
    1.17 +			  pgprot_t prot, int flag, int tot_pages);
    1.18  
    1.19  static ssize_t dom_usage_read(struct file * file, char * buff, size_t size, loff_t * off)
    1.20  {
    1.21 @@ -330,6 +332,7 @@ static unsigned long handle_dom0_cmd_map
    1.22    addr = direct_mmap(argbuf.start_pfn << PAGE_SHIFT,
    1.23  		     argbuf.tot_pages << PAGE_SHIFT,
    1.24  		     PAGE_SHARED,
    1.25 +		     MAP_DISCONT,
    1.26  		     argbuf.tot_pages);
    1.27  
    1.28    return addr;