Magellan Linux

Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1105-2.6.25-xen-pgd_walk-use-limit-argument-instead-of-FIXADD.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 606 - (show annotations) (download)
Thu May 22 23:13:13 2008 UTC (16 years ago) by niro
File size: 1483 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 c20bdf7b8f3108b8c2007e5955723ff5640e0093 Mon Sep 17 00:00:00 2001
2 From: Eduardo Habkost <ehabkost@redhat.com>
3 Date: Mon, 7 Jan 2008 19:06:06 -0200
4 Subject: [PATCH] xen pgd_walk: use 'limit' argument instead of FIXADDR_TOP constant
5
6 Eliminating the usage of FIXADDR_TOP inside of pgd_walk(), so it
7 can become 64-bit-ready.
8
9 Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
10 ---
11 arch/x86/xen/mmu.c | 11 +++--------
12 1 files changed, 3 insertions(+), 8 deletions(-)
13
14 diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
15 index 16020ec..1fbc3ce 100644
16 --- a/arch/x86/xen/mmu.c
17 +++ b/arch/x86/xen/mmu.c
18 @@ -361,11 +361,11 @@ static int pgd_walk(pgd_t *pgd_base, int (*func)(struct page *, enum pt_level),
19 if (xen_feature(XENFEAT_auto_translated_physmap))
20 return 0;
21
22 - for (; addr != FIXADDR_TOP; pgd++, addr = pgd_next) {
23 + for (; addr != limit; pgd++, addr = pgd_next) {
24 pud_t *pud;
25 unsigned long pud_limit, pud_next;
26
27 - pgd_next = pud_limit = pgd_addr_end(addr, FIXADDR_TOP);
28 + pgd_next = pud_limit = pgd_addr_end(addr, limit);
29
30 if (!pgd_val(*pgd))
31 continue;
32 @@ -379,12 +379,7 @@ static int pgd_walk(pgd_t *pgd_base, int (*func)(struct page *, enum pt_level),
33 pmd_t *pmd;
34 unsigned long pmd_limit;
35
36 - pud_next = pud_addr_end(addr, pud_limit);
37 -
38 - if (pud_next < limit)
39 - pmd_limit = pud_next;
40 - else
41 - pmd_limit = limit;
42 + pud_next = pmd_limit = pud_addr_end(addr, pud_limit);
43
44 if (pud_none(*pud))
45 continue;
46 --
47 1.5.4.1
48