/[pkg-src]/trunk/kernel26-xen/patches-2.6.25-r1/1076-2.6.25-xen-Pull-spp_getpage-changes-from-XS-upstream-REVIEWM.patch |
Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1076-2.6.25-xen-Pull-spp_getpage-changes-from-XS-upstream-REVIEWM.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: 890 byte(s)
Thu May 22 23:13:13 2008 UTC (16 years, 4 months ago) by niro
File size: 890 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 68b13009f935825ad5f3aaff839ad9077ee51d15 Mon Sep 17 00:00:00 2001 |
2 | From: Eduardo Habkost <ehabkost@redhat.com> |
3 | Date: Wed, 23 Jan 2008 13:21:20 -0200 |
4 | Subject: [PATCH] Pull spp_getpage() changes from XS upstream (REVIEWME) |
5 | |
6 | Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> |
7 | --- |
8 | arch/x86/mm/init_64.c | 6 +++++- |
9 | 1 files changed, 5 insertions(+), 1 deletions(-) |
10 | |
11 | diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c |
12 | index 58ae6ad..2e6af9d 100644 |
13 | --- a/arch/x86/mm/init_64.c |
14 | +++ b/arch/x86/mm/init_64.c |
15 | @@ -274,7 +274,11 @@ static __init void *spp_getpage(void) |
16 | |
17 | if (after_bootmem) |
18 | ptr = (void *) get_zeroed_page(GFP_ATOMIC); |
19 | - else |
20 | + else if (start_pfn < table_end) { |
21 | + ptr = __va(start_pfn << PAGE_SHIFT); |
22 | + start_pfn++; |
23 | + memset(ptr, 0, PAGE_SIZE); |
24 | + } else |
25 | ptr = alloc_bootmem_pages(PAGE_SIZE); |
26 | |
27 | if (!ptr || ((unsigned long)ptr & ~PAGE_MASK)) { |
28 | -- |
29 | 1.5.4.1 |
30 |