lkml.org 
[lkml]   [2006]   [Jan]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[patch 3/6] mm: PageActive no testset
    Date
    PG_active is protected by zone->lru_lock, it does not need TestSet/TestClear
    operations.

    Signed-off-by: Nick Piggin <npiggin@suse.de>

    Index: linux-2.6/mm/vmscan.c
    ===================================================================
    --- linux-2.6.orig/mm/vmscan.c
    +++ linux-2.6/mm/vmscan.c
    @@ -1011,8 +1011,9 @@ refill_inactive_zone(struct zone *zone,
    prefetchw_prev_lru_page(page, &l_inactive, flags);
    BUG_ON(PageLRU(page));
    SetPageLRU(page);
    - if (!TestClearPageActive(page))
    - BUG();
    + BUG_ON(!PageActive(page));
    + ClearPageActive(page);
    +
    list_move(&page->lru, &zone->inactive_list);
    pgmoved++;
    if (!pagevec_add(&pvec, page)) {
    Index: linux-2.6/mm/swap.c
    ===================================================================
    --- linux-2.6.orig/mm/swap.c
    +++ linux-2.6/mm/swap.c
    @@ -364,8 +364,8 @@ void __pagevec_lru_add_active(struct pag
    }
    BUG_ON(PageLRU(page));
    SetPageLRU(page);
    - if (TestSetPageActive(page))
    - BUG();
    + BUG_ON(PageActive(page));
    + SetPageActive(page);
    add_page_to_active_list(zone, page);
    }
    if (zone)
    Index: linux-2.6/include/linux/page-flags.h
    ===================================================================
    --- linux-2.6.orig/include/linux/page-flags.h
    +++ linux-2.6/include/linux/page-flags.h
    @@ -251,8 +251,6 @@ extern void __mod_page_state_offset(unsi
    #define PageActive(page) test_bit(PG_active, &(page)->flags)
    #define SetPageActive(page) set_bit(PG_active, &(page)->flags)
    #define ClearPageActive(page) clear_bit(PG_active, &(page)->flags)
    -#define TestClearPageActive(page) test_and_clear_bit(PG_active, &(page)->flags)
    -#define TestSetPageActive(page) test_and_set_bit(PG_active, &(page)->flags)

    #define PageSlab(page) test_bit(PG_slab, &(page)->flags)
    #define SetPageSlab(page) set_bit(PG_slab, &(page)->flags)
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2006-01-19 20:28    [W:0.026 / U:31.116 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site