ia64/xen-unstable

changeset 6144:4995d5f167c9

merge
author iap10@freefall.cl.cam.ac.uk
date Fri Aug 12 16:59:24 2005 +0000 (2005-08-12)
parents ba46bd7f5cdf ab3813d38b20
children 100837b7abec
files linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c linux-2.6-xen-sparse/arch/xen/i386/mm/hypervisor.c linux-2.6-xen-sparse/arch/xen/i386/mm/pgtable.c linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypercall.h linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/pgtable.h tools/libxc/Makefile tools/libxc/xc_core.c tools/libxc/xc_linux_build.c tools/libxc/xc_linux_restore.c tools/libxc/xc_linux_save.c tools/libxc/xc_load_elf.c tools/libxc/xc_ptrace.c tools/libxc/xc_vmx_build.c tools/python/setup.py tools/xenstore/Makefile tools/xenstore/xenstored_core.c xen/arch/ia64/xentime.c xen/arch/x86/setup.c xen/arch/x86/time.c xen/include/public/dom0_ops.h xen/include/public/xen.h xen/include/xen/time.h
line diff
     2.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/mm/hypervisor.c	Fri Aug 12 15:59:34 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/mm/hypervisor.c	Fri Aug 12 16:59:24 2005 +0000
     2.3 @@ -286,8 +286,8 @@ void xen_contig_memory(unsigned long vst
     2.4          pmd = pmd_offset(pud, (vstart + (i*PAGE_SIZE)));
     2.5          pte = pte_offset_kernel(pmd, (vstart + (i*PAGE_SIZE)));
     2.6          mfn = pte_mfn(*pte);
     2.7 -        HYPERVISOR_update_va_mapping(
     2.8 -            vstart + (i*PAGE_SIZE), __pte_ma(0), 0);
     2.9 +        BUG_ON(HYPERVISOR_update_va_mapping(
    2.10 +            vstart + (i*PAGE_SIZE), __pte_ma(0), 0));
    2.11          phys_to_machine_mapping[(__pa(vstart)>>PAGE_SHIFT)+i] =
    2.12              INVALID_P2M_ENTRY;
    2.13          BUG_ON(HYPERVISOR_dom_mem_op(
    2.14 @@ -300,9 +300,9 @@ void xen_contig_memory(unsigned long vst
    2.15  
    2.16      /* 3. Map the new extent in place of old pages. */
    2.17      for (i = 0; i < (1<<order); i++) {
    2.18 -        HYPERVISOR_update_va_mapping(
    2.19 +        BUG_ON(HYPERVISOR_update_va_mapping(
    2.20              vstart + (i*PAGE_SIZE),
    2.21 -            __pte_ma(((mfn+i)<<PAGE_SHIFT)|__PAGE_KERNEL), 0);
    2.22 +            __pte_ma(((mfn+i)<<PAGE_SHIFT)|__PAGE_KERNEL), 0));
    2.23          xen_machphys_update(mfn+i, (__pa(vstart)>>PAGE_SHIFT)+i);
    2.24          phys_to_machine_mapping[(__pa(vstart)>>PAGE_SHIFT)+i] = mfn+i;
    2.25      }
    2.26 @@ -345,7 +345,8 @@ unsigned long allocate_empty_lowmem_regi
    2.27  #ifdef CONFIG_X86_64
    2.28          xen_l1_entry_update(pte, __pte(0));
    2.29  #else
    2.30 -        HYPERVISOR_update_va_mapping(vstart + (i*PAGE_SIZE), __pte_ma(0), 0);
    2.31 +        BUG_ON(HYPERVISOR_update_va_mapping(vstart + (i*PAGE_SIZE), 
    2.32 +					    __pte_ma(0), 0));
    2.33  #endif
    2.34          phys_to_machine_mapping[(__pa(vstart)>>PAGE_SHIFT)+i] =
    2.35              INVALID_P2M_ENTRY;
     3.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/mm/pgtable.c	Fri Aug 12 15:59:34 2005 +0000
     3.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/mm/pgtable.c	Fri Aug 12 16:59:24 2005 +0000
     3.3 @@ -222,8 +222,8 @@ void pte_free(struct page *pte)
     3.4  	unsigned long va = (unsigned long)__va(page_to_pfn(pte)<<PAGE_SHIFT);
     3.5  
     3.6  	if (!pte_write(*virt_to_ptep(va)))
     3.7 -		HYPERVISOR_update_va_mapping(
     3.8 -			va, pfn_pte(page_to_pfn(pte), PAGE_KERNEL), 0);
     3.9 +		BUG_ON(HYPERVISOR_update_va_mapping(
    3.10 +			va, pfn_pte(page_to_pfn(pte), PAGE_KERNEL), 0));
    3.11  
    3.12  	ClearPageForeign(pte);
    3.13  	set_page_count(pte, 1);
    3.14 @@ -355,10 +355,10 @@ void pgd_free(pgd_t *pgd)
    3.15  
    3.16  	if (!pte_write(*ptep)) {
    3.17  		xen_pgd_unpin(__pa(pgd));
    3.18 -		HYPERVISOR_update_va_mapping(
    3.19 +		BUG_ON(HYPERVISOR_update_va_mapping(
    3.20  			(unsigned long)pgd,
    3.21  			pfn_pte(virt_to_phys(pgd)>>PAGE_SHIFT, PAGE_KERNEL),
    3.22 -			0);
    3.23 +			0));
    3.24  	}
    3.25  
    3.26  	/* in the PAE case user pgd entries are overwritten before usage */
    3.27 @@ -451,9 +451,9 @@ static inline void mm_walk_set_prot(void
    3.28  
    3.29  	if (PageHighMem(page))
    3.30  		return;
    3.31 -	HYPERVISOR_update_va_mapping(
    3.32 +	BUG_ON(HYPERVISOR_update_va_mapping(
    3.33  		(unsigned long)__va(pfn << PAGE_SHIFT),
    3.34 -		pfn_pte(pfn, flags), 0);
    3.35 +		pfn_pte(pfn, flags), 0));
    3.36  }
    3.37  
    3.38  static void mm_walk(struct mm_struct *mm, pgprot_t flags)
    3.39 @@ -492,10 +492,10 @@ void mm_pin(struct mm_struct *mm)
    3.40      spin_lock(&mm->page_table_lock);
    3.41  
    3.42      mm_walk(mm, PAGE_KERNEL_RO);
    3.43 -    HYPERVISOR_update_va_mapping(
    3.44 +    BUG_ON(HYPERVISOR_update_va_mapping(
    3.45          (unsigned long)mm->pgd,
    3.46          pfn_pte(virt_to_phys(mm->pgd)>>PAGE_SHIFT, PAGE_KERNEL_RO),
    3.47 -        UVMF_TLB_FLUSH);
    3.48 +        UVMF_TLB_FLUSH));
    3.49      xen_pgd_pin(__pa(mm->pgd));
    3.50      mm->context.pinned = 1;
    3.51      spin_lock(&mm_unpinned_lock);
    3.52 @@ -510,9 +510,9 @@ void mm_unpin(struct mm_struct *mm)
    3.53      spin_lock(&mm->page_table_lock);
    3.54  
    3.55      xen_pgd_unpin(__pa(mm->pgd));
    3.56 -    HYPERVISOR_update_va_mapping(
    3.57 +    BUG_ON(HYPERVISOR_update_va_mapping(
    3.58          (unsigned long)mm->pgd,
    3.59 -        pfn_pte(virt_to_phys(mm->pgd)>>PAGE_SHIFT, PAGE_KERNEL), 0);
    3.60 +        pfn_pte(virt_to_phys(mm->pgd)>>PAGE_SHIFT, PAGE_KERNEL), 0));
    3.61      mm_walk(mm, PAGE_KERNEL);
    3.62      xen_tlb_flush();
    3.63      mm->context.pinned = 0;
     4.1 --- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c	Fri Aug 12 15:59:34 2005 +0000
     4.2 +++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c	Fri Aug 12 16:59:24 2005 +0000
     4.3 @@ -211,11 +211,11 @@ static void balloon_process(void *unused
     4.4              /* Link back into the page tables if it's not a highmem page. */
     4.5              if ( pfn < max_low_pfn )
     4.6              {
     4.7 -                HYPERVISOR_update_va_mapping(
     4.8 +                BUG_ON(HYPERVISOR_update_va_mapping(
     4.9                      (unsigned long)__va(pfn << PAGE_SHIFT),
    4.10                      __pte_ma((mfn_list[i] << PAGE_SHIFT) |
    4.11                               pgprot_val(PAGE_KERNEL)),
    4.12 -                    0);
    4.13 +                    0));
    4.14              }
    4.15  
    4.16              /* Finally, relinquish the memory back to the system allocator. */
    4.17 @@ -249,8 +249,8 @@ static void balloon_process(void *unused
    4.18              {
    4.19                  v = phys_to_virt(pfn << PAGE_SHIFT);
    4.20                  scrub_pages(v, 1);
    4.21 -                HYPERVISOR_update_va_mapping(
    4.22 -                    (unsigned long)v, __pte_ma(0), 0);
    4.23 +                BUG_ON(HYPERVISOR_update_va_mapping(
    4.24 +                    (unsigned long)v, __pte_ma(0), 0));
    4.25              }
    4.26  #ifdef CONFIG_XEN_SCRUB_PAGES
    4.27              else
     5.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypercall.h	Fri Aug 12 15:59:34 2005 +0000
     5.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypercall.h	Fri Aug 12 16:59:24 2005 +0000
     5.3 @@ -386,13 +386,6 @@ HYPERVISOR_update_va_mapping(
     5.4  	  "4" (flags)
     5.5  	: "memory" );
     5.6  
     5.7 -    if ( unlikely(ret < 0) )
     5.8 -    {
     5.9 -        printk(KERN_ALERT "Failed update VA mapping: %08lx, %08lx, %08lx\n",
    5.10 -               va, (new_val).pte_low, flags);
    5.11 -        BUG();
    5.12 -    }
    5.13 -
    5.14      return ret;
    5.15  }
    5.16  
     6.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/pgtable.h	Fri Aug 12 15:59:34 2005 +0000
     6.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/pgtable.h	Fri Aug 12 16:59:24 2005 +0000
     6.3 @@ -497,7 +497,7 @@ extern inline pte_t pte_modify(pte_t pte
     6.4  	do {								  \
     6.5  		if (__dirty) {						  \
     6.6  		        if ( likely((__vma)->vm_mm == current->mm) ) {    \
     6.7 -			    HYPERVISOR_update_va_mapping((__address), (__entry), UVMF_INVLPG|UVMF_MULTI|(unsigned long)((__vma)->vm_mm->cpu_vm_mask.bits)); \
     6.8 +			    BUG_ON(HYPERVISOR_update_va_mapping((__address), (__entry), UVMF_INVLPG|UVMF_MULTI|(unsigned long)((__vma)->vm_mm->cpu_vm_mask.bits))); \
     6.9  			} else {                                          \
    6.10                              xen_l1_entry_update((__ptep), (__entry)); \
    6.11  			    flush_tlb_page((__vma), (__address));         \