diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-03-10 16:08:08 +0000 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-03-10 16:08:08 +0000 |
| commit | de18760cd769d9c072e43c2f586b3a9734fa67b6 (patch) | |
| tree | 2cba011d061fefbc29c611654df804e030769415 /linux-2.4.29-xen-sparse | |
| parent | 6c23763e5e9561ec315bb7de1a4426f9abd05291 (diff) | |
| download | xen-de18760cd769d9c072e43c2f586b3a9734fa67b6.tar.gz xen-de18760cd769d9c072e43c2f586b3a9734fa67b6.tar.bz2 xen-de18760cd769d9c072e43c2f586b3a9734fa67b6.zip | |
bitkeeper revision 1.1159.266.1 (423070e8gpQdLbFsdaIs7JDG4U12ZA)
A couple of fixes for 2.4.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'linux-2.4.29-xen-sparse')
| -rw-r--r-- | linux-2.4.29-xen-sparse/arch/xen/mm/init.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/linux-2.4.29-xen-sparse/arch/xen/mm/init.c b/linux-2.4.29-xen-sparse/arch/xen/mm/init.c index a2363d0cce..40a5af9273 100644 --- a/linux-2.4.29-xen-sparse/arch/xen/mm/init.c +++ b/linux-2.4.29-xen-sparse/arch/xen/mm/init.c @@ -223,10 +223,9 @@ static void __init pagetable_init (void) pmd_t *kpmd, *pmd; pte_t *kpte, *pte, *pte_base; - end = (unsigned long)__va(max_low_pfn * PAGE_SIZE); - ram_end = (unsigned long)__va(xen_start_info.nr_pages * PAGE_SIZE); - if ( ram_end > end ) - ram_end = end; + ram_end = end = (unsigned long)__va(max_low_pfn * PAGE_SIZE); + if ( xen_start_info.nr_pages < max_low_pfn ) + ram_end = (unsigned long)__va(xen_start_info.nr_pages * PAGE_SIZE); pgd_base = init_mm.pgd; i = __pgd_offset(PAGE_OFFSET); |