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
vsprintf: pre-calculate final string length for later use
[safe/jmp/linux-2.6]
/
mm
/
swap.c
diff --git
a/mm/swap.c
b/mm/swap.c
index
168d53e
..
308e57d
100644
(file)
--- a/
mm/swap.c
+++ b/
mm/swap.c
@@
-189,7
+189,7
@@
void activate_page(struct page *page)
add_page_to_lru_list(zone, page, lru);
__count_vm_event(PGACTIVATE);
add_page_to_lru_list(zone, page, lru);
__count_vm_event(PGACTIVATE);
- update_page_reclaim_stat(zone, page,
!!
file, 1);
+ update_page_reclaim_stat(zone, page, file, 1);
}
spin_unlock_irq(&zone->lru_lock);
}
}
spin_unlock_irq(&zone->lru_lock);
}
@@
-496,7
+496,7
@@
EXPORT_SYMBOL(pagevec_lookup_tag);
*/
void __init swap_setup(void)
{
*/
void __init swap_setup(void)
{
- unsigned long megs =
num_phys
pages >> (20 - PAGE_SHIFT);
+ unsigned long megs =
totalram_
pages >> (20 - PAGE_SHIFT);
#ifdef CONFIG_SWAP
bdi_init(swapper_space.backing_dev_info);
#ifdef CONFIG_SWAP
bdi_init(swapper_space.backing_dev_info);