/[pkg-src]/trunk/kernel26-xen/patches-2.6.25-r1/1038-2.6.25-xen-typedefs-for-pte_val-and-friends.patch |
Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1038-2.6.25-xen-typedefs-for-pte_val-and-friends.patch
Parent Directory | Revision Log
Revision 606 -
(show annotations)
(download)
Thu May 22 23:13:13 2008 UTC (16 years, 4 months ago) by niro
File size: 4114 byte(s)
Thu May 22 23:13:13 2008 UTC (16 years, 4 months ago) by niro
File size: 4114 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 d66f77312465174160925576d6ebca34523306b4 Mon Sep 17 00:00:00 2001 |
2 | From: Eduardo Habkost <ehabkost@Rawhide-64.localdomain> |
3 | Date: Tue, 27 Nov 2007 20:09:43 -0200 |
4 | Subject: [PATCH] typedefs for pte_val() and friends |
5 | |
6 | Trying to reduce the #ifdef mess a bit. |
7 | |
8 | Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> |
9 | --- |
10 | arch/x86/xen/mmu.c | 20 ++++++++++---------- |
11 | arch/x86/xen/mmu.h | 23 +++++++---------------- |
12 | 2 files changed, 17 insertions(+), 26 deletions(-) |
13 | |
14 | diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c |
15 | index 8660786..b974434 100644 |
16 | --- a/arch/x86/xen/mmu.c |
17 | +++ b/arch/x86/xen/mmu.c |
18 | @@ -186,7 +186,7 @@ void xen_pmd_clear(pmd_t *pmdp) |
19 | xen_set_pmd(pmdp, __pmd(0)); |
20 | } |
21 | |
22 | -unsigned long long xen_pte_val(pte_t pte) |
23 | +pteval_t xen_pte_val(pte_t pte) |
24 | { |
25 | unsigned long long ret = 0; |
26 | |
27 | @@ -198,7 +198,7 @@ unsigned long long xen_pte_val(pte_t pte) |
28 | return ret; |
29 | } |
30 | |
31 | -unsigned long long xen_pmd_val(pmd_t pmd) |
32 | +pmdval_t xen_pmd_val(pmd_t pmd) |
33 | { |
34 | unsigned long long ret = pmd.pmd; |
35 | if (ret) |
36 | @@ -206,7 +206,7 @@ unsigned long long xen_pmd_val(pmd_t pmd) |
37 | return ret; |
38 | } |
39 | |
40 | -unsigned long long xen_pgd_val(pgd_t pgd) |
41 | +pgdval_t xen_pgd_val(pgd_t pgd) |
42 | { |
43 | unsigned long long ret = pgd.pgd; |
44 | if (ret) |
45 | @@ -214,7 +214,7 @@ unsigned long long xen_pgd_val(pgd_t pgd) |
46 | return ret; |
47 | } |
48 | |
49 | -pte_t xen_make_pte(unsigned long long pte) |
50 | +pte_t xen_make_pte(pteval_t pte) |
51 | { |
52 | if (pte & _PAGE_PRESENT) { |
53 | pte = phys_to_machine(XPADDR(pte)).maddr; |
54 | @@ -224,7 +224,7 @@ pte_t xen_make_pte(unsigned long long pte) |
55 | return (pte_t){ .pte = pte }; |
56 | } |
57 | |
58 | -pmd_t xen_make_pmd(unsigned long long pmd) |
59 | +pmd_t xen_make_pmd(pmdval_t pmd) |
60 | { |
61 | if (pmd & 1) |
62 | pmd = phys_to_machine(XPADDR(pmd)).maddr; |
63 | @@ -232,7 +232,7 @@ pmd_t xen_make_pmd(unsigned long long pmd) |
64 | return (pmd_t){ pmd }; |
65 | } |
66 | |
67 | -pgd_t xen_make_pgd(unsigned long long pgd) |
68 | +pgd_t xen_make_pgd(pgdval_t pgd) |
69 | { |
70 | if (pgd & _PAGE_PRESENT) |
71 | pgd = phys_to_machine(XPADDR(pgd)).maddr; |
72 | @@ -245,7 +245,7 @@ void xen_set_pte(pte_t *ptep, pte_t pte) |
73 | *ptep = pte; |
74 | } |
75 | |
76 | -unsigned long xen_pte_val(pte_t pte) |
77 | +pteval_t xen_pte_val(pte_t pte) |
78 | { |
79 | unsigned long ret = pte.pte_low; |
80 | |
81 | @@ -255,7 +255,7 @@ unsigned long xen_pte_val(pte_t pte) |
82 | return ret; |
83 | } |
84 | |
85 | -unsigned long xen_pgd_val(pgd_t pgd) |
86 | +pgdval_t xen_pgd_val(pgd_t pgd) |
87 | { |
88 | unsigned long ret = pgd.pgd; |
89 | if (ret) |
90 | @@ -263,7 +263,7 @@ unsigned long xen_pgd_val(pgd_t pgd) |
91 | return ret; |
92 | } |
93 | |
94 | -pte_t xen_make_pte(unsigned long pte) |
95 | +pte_t xen_make_pte(pteval_t pte) |
96 | { |
97 | if (pte & _PAGE_PRESENT) { |
98 | pte = phys_to_machine(XPADDR(pte)).maddr; |
99 | @@ -273,7 +273,7 @@ pte_t xen_make_pte(unsigned long pte) |
100 | return (pte_t){ pte }; |
101 | } |
102 | |
103 | -pgd_t xen_make_pgd(unsigned long pgd) |
104 | +pgd_t xen_make_pgd(pgdval_t pgd) |
105 | { |
106 | if (pgd & _PAGE_PRESENT) |
107 | pgd = phys_to_machine(XPADDR(pgd)).maddr; |
108 | diff --git a/arch/x86/xen/mmu.h b/arch/x86/xen/mmu.h |
109 | index b5e189b..ce425a4 100644 |
110 | --- a/arch/x86/xen/mmu.h |
111 | +++ b/arch/x86/xen/mmu.h |
112 | @@ -37,15 +37,15 @@ void xen_exit_mmap(struct mm_struct *mm); |
113 | void xen_pgd_pin(pgd_t *pgd); |
114 | //void xen_pgd_unpin(pgd_t *pgd); |
115 | |
116 | -#ifdef CONFIG_X86_PAE |
117 | -unsigned long long xen_pte_val(pte_t); |
118 | -unsigned long long xen_pmd_val(pmd_t); |
119 | -unsigned long long xen_pgd_val(pgd_t); |
120 | +pteval_t xen_pte_val(pte_t); |
121 | +pmdval_t xen_pmd_val(pmd_t); |
122 | +pgdval_t xen_pgd_val(pgd_t); |
123 | |
124 | -pte_t xen_make_pte(unsigned long long); |
125 | -pmd_t xen_make_pmd(unsigned long long); |
126 | -pgd_t xen_make_pgd(unsigned long long); |
127 | +pte_t xen_make_pte(pteval_t); |
128 | +pmd_t xen_make_pmd(pmdval_t); |
129 | +pgd_t xen_make_pgd(pgdval_t); |
130 | |
131 | +#ifdef CONFIG_X86_PAE |
132 | void xen_set_pte_at(struct mm_struct *mm, unsigned long addr, |
133 | pte_t *ptep, pte_t pteval); |
134 | void xen_set_pte_atomic(pte_t *ptep, pte_t pte); |
135 | @@ -53,15 +53,6 @@ void xen_set_pud(pud_t *ptr, pud_t val); |
136 | void xen_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep); |
137 | void xen_pmd_clear(pmd_t *pmdp); |
138 | |
139 | - |
140 | -#else |
141 | -unsigned long xen_pte_val(pte_t); |
142 | -unsigned long xen_pmd_val(pmd_t); |
143 | -unsigned long xen_pgd_val(pgd_t); |
144 | - |
145 | -pte_t xen_make_pte(unsigned long); |
146 | -pmd_t xen_make_pmd(unsigned long); |
147 | -pgd_t xen_make_pgd(unsigned long); |
148 | #endif |
149 | |
150 | #endif /* _XEN_MMU_H */ |
151 | -- |
152 | 1.5.4.1 |
153 |