git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NETFILTER]: H.323 helper: move some function prototypes to ip_conntrack_h323.h
[safe/jmp/linux-2.6]
/
mm
/
swap.c
diff --git
a/mm/swap.c
b/mm/swap.c
index
985324e
..
88895c2
100644
(file)
--- a/
mm/swap.c
+++ b/
mm/swap.c
@@
-215,7
+215,7
@@
void fastcall __page_cache_release(struct page *page)
spin_lock_irqsave(&zone->lru_lock, flags);
BUG_ON(!PageLRU(page));
spin_lock_irqsave(&zone->lru_lock, flags);
BUG_ON(!PageLRU(page));
- ClearPageLRU(page);
+
__
ClearPageLRU(page);
del_page_from_lru(zone, page);
spin_unlock_irqrestore(&zone->lru_lock, flags);
}
del_page_from_lru(zone, page);
spin_unlock_irqrestore(&zone->lru_lock, flags);
}
@@
-266,7
+266,7
@@
void release_pages(struct page **pages, int nr, int cold)
spin_lock_irq(&zone->lru_lock);
}
BUG_ON(!PageLRU(page));
spin_lock_irq(&zone->lru_lock);
}
BUG_ON(!PageLRU(page));
- ClearPageLRU(page);
+
__
ClearPageLRU(page);
del_page_from_lru(zone, page);
}
del_page_from_lru(zone, page);
}
@@
-374,8
+374,8
@@
void __pagevec_lru_add_active(struct pagevec *pvec)
}
BUG_ON(PageLRU(page));
SetPageLRU(page);
}
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)
add_page_to_active_list(zone, page);
}
if (zone)
@@
-512,7
+512,7
@@
long percpu_counter_sum(struct percpu_counter *fbc)
spin_lock(&fbc->lock);
ret = fbc->count;
spin_lock(&fbc->lock);
ret = fbc->count;
- for_each_cpu(cpu) {
+ for_each_
possible_
cpu(cpu) {
long *pcount = per_cpu_ptr(fbc->counters, cpu);
ret += *pcount;
}
long *pcount = per_cpu_ptr(fbc->counters, cpu);
ret += *pcount;
}