Magellan Linux

Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1039-2.6.25-xen-x86_64-implementation-of-some-page.h-macros.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 606 - (show annotations) (download)
Thu May 22 23:13:13 2008 UTC (15 years, 11 months ago) by niro
File size: 1260 byte(s)
-ver bump to 2.6.25-magellan-r1:
- linux-2.6.25.4
- fbcondecor-0.9.4
- squashfs-3.3
- unionfs-2.3.3
- tuxonice-3.0-rc7
- linux-phc-0.3.0
- acpi-dstd-0.9a
- reiser4
- xen-3.2.0
. ipw3945-1.2.2

1 From 6ef5522b5ec26dd6861e3b51aed11c3addc09525 Mon Sep 17 00:00:00 2001
2 From: Eduardo Habkost <ehabkost@redhat.com>
3 Date: Wed, 28 Nov 2007 12:20:59 -0200
4 Subject: [PATCH] x86_64 implementation of some page.h macros
5
6 Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
7 ---
8 include/xen/page.h | 3 +--
9 1 files changed, 1 insertions(+), 2 deletions(-)
10
11 diff --git a/include/xen/page.h b/include/xen/page.h
12 index 4456566..7bf5b56 100644
13 --- a/include/xen/page.h
14 +++ b/include/xen/page.h
15 @@ -154,7 +154,6 @@ static inline pteval_t pte_val_ma(pte_t x)
16 {
17 return native_pte_val(x);
18 }
19 -#define pmd_val_ma(v) ((v).pmd)
20 #define pud_val_ma(v) ((v).pgd.pgd)
21 #define __pte_ma(x) (native_make_pte(x))
22 #define __pmd_ma(x) ((pmd_t) { (x) } )
23 @@ -162,11 +161,11 @@ static inline pteval_t pte_val_ma(pte_t x)
24 #define pte_mfn(_pte) ((native_pte_val(_pte) & __PHYSICAL_MASK) >> PAGE_SHIFT)
25 #define mfn_pte(pfn, prot) __pte_ma(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
26 #define pte_val_ma(x) ((x).pte)
27 -#define pmd_val_ma(v) ((v).pud.pgd.pgd)
28 #define __pte_ma(x) ((pte_t) { (x) } )
29 #endif /* CONFIG_X86_PAE */
30
31 #define pgd_val_ma(x) ((x).pgd)
32 +#define pmd_val_ma(x) (native_pmd_val((x)))
33
34
35 xmaddr_t arbitrary_virt_to_machine(unsigned long address);
36 --
37 1.5.4.1
38