Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kernel26-xen/patches-2.6.25-r1/1027-2.6.25-xen-patch-2.6.25-rc5-rc6.patch

    Annotation of /trunk/kernel26-xen/patches-2.6.25-r1/1027-2.6.25-xen-patch-2.6.25-rc5-rc6.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 609 - (hide annotations) (download)
    Fri May 23 17:35:37 2008 UTC (16 years ago) by niro
    File size: 2700 byte(s) 
    -using opensuse xen patchset, updated kernel configs
    1 niro 609 From: kernel.org
    2     Subject: 2.6.25-rc6
    3    
    4     ## Automatically generated incremental diff
    5     ## From: linux-2.6.25-rc5
    6     ## To: linux-2.6.25-rc6
    7     ## Robot: $Id: 1027-2.6.25-xen-patch-2.6.25-rc5-rc6.patch,v 1.1 2008-05-23 17:35:36 niro Exp $
    8    
    9     Automatically created from "patches.kernel.org/patch-2.6.25-rc5-rc6" by xen-port-patches.py
    10     Acked-by: jbeulich@novell.com
    11    
    12     Index: head-2008-04-02/arch/x86/mm/ioremap-xen.c
    13     ===================================================================
    14     --- head-2008-04-02.orig/arch/x86/mm/ioremap-xen.c 2008-04-02 15:57:30.000000000 +0200
    15     +++ head-2008-04-02/arch/x86/mm/ioremap-xen.c 2008-04-02 15:58:04.000000000 +0200
    16     @@ -299,8 +299,6 @@ static void __iomem *__ioremap(unsigned
    17     return NULL;
    18     }
    19    
    20     - WARN_ON_ONCE(domid == DOMID_SELF);
    21     -
    22     switch (mode) {
    23     case IOR_MODE_UNCACHED:
    24     default:
    25     Index: head-2008-04-02/arch/x86/mm/pgtable_32-xen.c
    26     ===================================================================
    27     --- head-2008-04-02.orig/arch/x86/mm/pgtable_32-xen.c 2008-04-02 14:25:44.000000000 +0200
    28     +++ head-2008-04-02/arch/x86/mm/pgtable_32-xen.c 2008-03-17 10:46:19.000000000 +0100
    29     @@ -339,14 +339,18 @@ static void pgd_mop_up_pmds(struct mm_st
    30    
    31     pgd_t *pgd_alloc(struct mm_struct *mm)
    32     {
    33     - pgd_t *pgd = quicklist_alloc(0, GFP_KERNEL, pgd_ctor);
    34     + pgd_t *pgd = (pgd_t *)__get_free_page(GFP_KERNEL | __GFP_ZERO);
    35    
    36     pgd_test_and_unpin(pgd);
    37    
    38     - mm->pgd = pgd; /* so that alloc_pd can use it */
    39     + /* so that alloc_pd can use it */
    40     + mm->pgd = pgd;
    41     + if (pgd)
    42     + pgd_ctor(pgd);
    43    
    44     if (pgd && !pgd_prepopulate_pmd(mm, pgd)) {
    45     - quicklist_free(0, pgd_dtor, pgd);
    46     + pgd_dtor(pgd);
    47     + free_page((unsigned long)pgd);
    48     pgd = NULL;
    49     }
    50    
    51     @@ -369,12 +373,8 @@ void pgd_free(struct mm_struct *mm, pgd_
    52     xen_destroy_contiguous_region((unsigned long)pgd, 0);
    53    
    54     pgd_mop_up_pmds(mm, pgd);
    55     - quicklist_free(0, pgd_dtor, pgd);
    56     -}
    57     -
    58     -void check_pgt_cache(void)
    59     -{
    60     - quicklist_trim(0, pgd_dtor, 25, 16);
    61     + pgd_dtor(pgd);
    62     + free_page((unsigned long)pgd);
    63     }
    64    
    65     void __pte_free_tlb(struct mmu_gather *tlb, struct page *pte)
    66     Index: head-2008-04-02/include/asm-x86/mach-xen/asm/pgtable_32.h
    67     ===================================================================
    68     --- head-2008-04-02.orig/include/asm-x86/mach-xen/asm/pgtable_32.h 2008-04-02 15:51:46.000000000 +0200
    69     +++ head-2008-04-02/include/asm-x86/mach-xen/asm/pgtable_32.h 2008-04-02 15:53:22.000000000 +0200
    70     @@ -26,10 +26,9 @@
    71     struct vm_area_struct;
    72    
    73     extern pgd_t *swapper_pg_dir;
    74     -extern struct kmem_cache *pmd_cache;
    75     -void check_pgt_cache(void);
    76    
    77     -static inline void pgtable_cache_init(void) {}
    78     +static inline void pgtable_cache_init(void) { }
    79     +static inline void check_pgt_cache(void) { }
    80     void paging_init(void);
    81    
    82