Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kernel26-xen/patches-2.6.25-r1/1073-2.6.25-xen-Move-addr_to_page-to-init.h.patch

    Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1073-2.6.25-xen-Move-addr_to_page-to-init.h.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: 1479 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 45176a7b72aa29eb7791a8fa1e5a8150c05e5052 Mon Sep 17 00:00:00 2001
    2 From: Eduardo Habkost <ehabkost@redhat.com>
    3 Date: Tue, 18 Dec 2007 17:40:35 -0200
    4 Subject: [PATCH] xen: Move addr_to_page() to init.h
    5
    6 Needed on arch/x86/mm/init_64.c
    7
    8 Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
    9 ---
    10 arch/x86/xen/init.h | 7 +++++++
    11 arch/x86/xen/init_64.c | 7 -------
    12 2 files changed, 7 insertions(+), 7 deletions(-)
    13
    14 diff --git a/arch/x86/xen/init.h b/arch/x86/xen/init.h
    15 index ee22051..fee0c05 100644
    16 --- a/arch/x86/xen/init.h
    17 +++ b/arch/x86/xen/init.h
    18 @@ -10,4 +10,11 @@ extern unsigned long start_pfn;
    19
    20 void early_make_page_readonly(void *va, unsigned int feature);
    21
    22 +
    23 +#define addr_to_page(addr, page) \
    24 + (addr) &= PHYSICAL_PAGE_MASK; \
    25 + (page) = ((unsigned long *) ((unsigned long) \
    26 + (((mfn_to_pfn((addr) >> PAGE_SHIFT)) << PAGE_SHIFT) + \
    27 + __START_KERNEL_map)))
    28 +
    29 #endif /* __X86_XEN_INIT_H */
    30 diff --git a/arch/x86/xen/init_64.c b/arch/x86/xen/init_64.c
    31 index 872c152..1e53c59 100644
    32 --- a/arch/x86/xen/init_64.c
    33 +++ b/arch/x86/xen/init_64.c
    34 @@ -11,13 +11,6 @@
    35 #include "init.h"
    36 #include "mmu.h"
    37
    38 -#define addr_to_page(addr, page) \
    39 - (addr) &= PHYSICAL_PAGE_MASK; \
    40 - (page) = ((unsigned long *) ((unsigned long) \
    41 - (((mfn_to_pfn((addr) >> PAGE_SHIFT)) << PAGE_SHIFT) + \
    42 - __START_KERNEL_map)))
    43 -
    44 -
    45 void __meminit early_make_page_readonly(void *va, unsigned int feature)
    46 {
    47 unsigned long addr, _va = (unsigned long)va;
    48 --
    49 1.5.4.1
    50