On Thu, 2007-06-21 at 15:53 +0200, Christian Ehrhardt wrote:
> diff -r 1bf85f927393 include/asm-powerpc/io.h
> --- a/include/asm-powerpc/io.h Thu Jun 21 08:04:49 2007 +0200
> +++ b/include/asm-powerpc/io.h Thu Jun 21 10:31:39 2007 +0200
> @@ -248,11 +248,13 @@ static inline void * phys_to_virt(unsign
> {
> return (void *)__va(address);
> }
> +#define bus_to_virt phys_to_virt
>
> /*
> * Change "struct page" to physical address.
> */
> #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT)
> +#define page_to_bus page_to_phys
>
> /* We do NOT want virtual merging, it would put too much pressure on
> * our iommu allocator. Instead, we want drivers to be smart enough
> diff -r 1bf85f927393 include/asm-powerpc/xen/asm/hypercall.h
> --- a/include/asm-powerpc/xen/asm/hypercall.h Thu Jun 21 08:04:49 2007 +0200
> +++ b/include/asm-powerpc/xen/asm/hypercall.h Thu Jun 21 09:56:55 2007 +0200
> @@ -72,6 +72,9 @@ static inline unsigned long HYPERVISOR_h
> return -ENOSYS;
> }
>
> +/* to compile gnttab_copy_grant_page() in drivers/xen/core/gnttab.c */
> +#define HYPERVISOR_mmu_update(req, count, success_count, domid) ({BUG();0;})
> +
> struct privcmd_hypercall;
> extern int privcmd_hypercall(struct privcmd_hypercall *hypercall);
>
> diff -r 1bf85f927393 include/asm-powerpc/xen/asm/hypervisor.h
> --- a/include/asm-powerpc/xen/asm/hypervisor.h Thu Jun 21 08:04:49 2007 +0200
> +++ b/include/asm-powerpc/xen/asm/hypervisor.h Thu Jun 21 08:26:48 2007 +0200
> @@ -131,6 +131,7 @@ int direct_remap_pfn_range(struct vm_are
> #define pfn_to_mfn(x) (x)
> #define mfn_to_pfn(x) (x)
> #define phys_to_machine(phys) ((maddr_t)(phys))
> +#define phys_to_machine_mapping_valid(pfn) (1)
>
> /* VIRT <-> MACHINE conversion */
> #define virt_to_machine(v) (phys_to_machine(__pa(v)))
> @@ -239,6 +240,7 @@ static inline void set_phys_to_machine(u
> #define pfn_pte_ma(pfn, prot) __pte(((pfn) << PAGE_SHIFT) |
> pgprot_val(prot))
>
> typedef unsigned long maddr_t;
> +typedef unsigned long paddr_t;
>
> #ifdef CONFIG_XEN_SCRUB_PAGES
Hi Christian, as far as I can see the vast majority of this patch is not
needed; the only part that's required is
phys_to_machine_mapping_valid().
Also, I can't find any changeset with the hash 1bf85f927393 . Maybe that
was a local MQ changeset?
--
Hollis Blanchard
IBM Linux Technology Center
_______________________________________________
Xen-ppc-devel mailing list
Xen-ppc-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ppc-devel
|
Home