Attachment 288761 Details for Bug 294811 – xen-unstable 12545:50467f56ed65 ported to 2.6.9-67.EL

[patch] xen-unstable 12545:50467f56ed65 ported to 2.6.9-67.EL

xen-unstable-12545-50467f56ed65 (text/plain), 4.05 KB, created by Ian Campbell on 2007-12-14 09:07:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Campbell

Created: 2007-12-14 09:07:18 UTC

Size: 4.05 KB

patch

obsolete

># HG changeset patch
># User kfraser@localhost.localdomain
># Node ID 50467f56ed65e31f2f92cb57fda11be071f41fd1
># Parent  25cb51eed511212ff542cf6285c7e8021610cd75
>[HVM] Fix building PV-on-HVM drivers on i386.
>Signed-off-by: Keir Fraser <keir@xensource.com>
>xen-unstable changeset: 12545:50467f56ed65e31f2f92cb57fda11be071f41fd1
>xen-unstable date: Mon Nov 27 10:02:24 2006 +0000
>
>diff -r 25cb51eed511 -r 50467f56ed65 include/asm-i386/mach-xen/asm/maddr.h
>--- a/include/asm-i386/mach-xen/asm/maddr.h	Sun Nov 26 17:39:09 2006 +0000
>+++ b/include/asm-i386/mach-xen/asm/maddr.h	Mon Nov 27 10:02:24 2006 +0000
>@@ -8,6 +8,15 @@
> #define INVALID_P2M_ENTRY	(~0UL)
> #define FOREIGN_FRAME_BIT	(1UL<<31)
> #define FOREIGN_FRAME(m)	((m) | FOREIGN_FRAME_BIT)
>+
>+/* Definitions for machine and pseudophysical addresses. */
>+#ifdef CONFIG_X86_PAE
>+typedef unsigned long long paddr_t;
>+typedef unsigned long long maddr_t;
>+#else
>+typedef unsigned long paddr_t;
>+typedef unsigned long maddr_t;
>+#endif
> 
> #ifdef CONFIG_XEN
> 
>@@ -101,26 +110,6 @@ static inline void set_phys_to_machine(u
> 	phys_to_machine_mapping[pfn] = mfn;
> }
> 
>-
>-#else /* !CONFIG_XEN */
>-
>-#define pfn_to_mfn(pfn) (pfn)
>-#define mfn_to_pfn(mfn) (mfn)
>-#define mfn_to_local_pfn(mfn) (mfn)
>-#define set_phys_to_machine(pfn, mfn) BUG_ON((pfn) != (mfn))
>-#define phys_to_machine_mapping_valid(pfn) (1)
>-
>-#endif /* !CONFIG_XEN */
>-
>-/* Definitions for machine and pseudophysical addresses. */
>-#ifdef CONFIG_X86_PAE
>-typedef unsigned long long paddr_t;
>-typedef unsigned long long maddr_t;
>-#else
>-typedef unsigned long paddr_t;
>-typedef unsigned long maddr_t;
>-#endif
>-
> static inline maddr_t phys_to_machine(paddr_t phys)
> {
> 	maddr_t machine = pfn_to_mfn(phys >> PAGE_SHIFT);
>@@ -148,6 +137,19 @@ static inline paddr_t pte_machine_to_phy
> 	return phys;
> }
> 
>+#else /* !CONFIG_XEN */
>+
>+#define pfn_to_mfn(pfn) (pfn)
>+#define mfn_to_pfn(mfn) (mfn)
>+#define mfn_to_local_pfn(mfn) (mfn)
>+#define set_phys_to_machine(pfn, mfn) BUG_ON((pfn) != (mfn))
>+#define phys_to_machine_mapping_valid(pfn) (1)
>+#define phys_to_machine(phys) ((maddr_t)(phys))
>+#define machine_to_phys(mach) ((paddr_t)(mach))
>+#define pte_machine_to_phys(mach) ((paddr_t)(mach))
>+
>+#endif /* !CONFIG_XEN */
>+
> /* VIRT <-> MACHINE conversion */
> #define virt_to_machine(v)	(phys_to_machine(__pa(v)))
> #define virt_to_mfn(v)		(pfn_to_mfn(__pa(v) >> PAGE_SHIFT))
>diff -r 25cb51eed511 -r 50467f56ed65 include/asm-x86_64/mach-xen/asm/maddr.h
>--- a/include/asm-x86_64/mach-xen/asm/maddr.h	Sun Nov 26 17:39:09 2006 +0000
>+++ b/include/asm-x86_64/mach-xen/asm/maddr.h	Mon Nov 27 10:02:24 2006 +0000
>@@ -8,6 +8,10 @@
> #define INVALID_P2M_ENTRY	(~0UL)
> #define FOREIGN_FRAME_BIT	(1UL<<63)
> #define FOREIGN_FRAME(m)	((m) | FOREIGN_FRAME_BIT)
>+
>+/* Definitions for machine and pseudophysical addresses. */
>+typedef unsigned long paddr_t;
>+typedef unsigned long maddr_t;
> 
> #ifdef CONFIG_XEN
> 
>@@ -99,20 +103,6 @@ static inline void set_phys_to_machine(u
> 	phys_to_machine_mapping[pfn] = mfn;
> }
> 
>-#else /* !CONFIG_XEN */
>-
>-#define pfn_to_mfn(pfn) (pfn)
>-#define mfn_to_pfn(mfn) (mfn)
>-#define mfn_to_local_pfn(mfn) (mfn)
>-#define set_phys_to_machine(pfn, mfn) BUG_ON((pfn) != (mfn))
>-#define phys_to_machine_mapping_valid(pfn) (1)
>-
>-#endif /* !CONFIG_XEN */
>-
>-/* Definitions for machine and pseudophysical addresses. */
>-typedef unsigned long paddr_t;
>-typedef unsigned long maddr_t;
>-
> static inline maddr_t phys_to_machine(paddr_t phys)
> {
> 	maddr_t machine = pfn_to_mfn(phys >> PAGE_SHIFT);
>@@ -135,6 +125,19 @@ static inline paddr_t pte_machine_to_phy
> 	return phys;
> }
> 
>+#else /* !CONFIG_XEN */
>+
>+#define pfn_to_mfn(pfn) (pfn)
>+#define mfn_to_pfn(mfn) (mfn)
>+#define mfn_to_local_pfn(mfn) (mfn)
>+#define set_phys_to_machine(pfn, mfn) BUG_ON((pfn) != (mfn))
>+#define phys_to_machine_mapping_valid(pfn) (1)
>+#define phys_to_machine(phys) ((maddr_t)(phys))
>+#define machine_to_phys(mach) ((paddr_t)(mach))
>+#define pte_machine_to_phys(mach) ((paddr_t)(mach))
>+
>+#endif /* !CONFIG_XEN */
>+
> /* VIRT <-> MACHINE conversion */
> #define virt_to_machine(v)	(phys_to_machine(__pa(v)))
> #define virt_to_mfn(v)		(pfn_to_mfn(__pa(v) >> PAGE_SHIFT))

Actions: View | Diff

Attachments on bug 294811: 198411 | 288051 | 288751 | 288761 | 288771 | 288781 | 288791 | 288801