git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc
[pandora-kernel.git]
/
mm
/
vmstat.c
diff --git
a/mm/vmstat.c
b/mm/vmstat.c
index
d52b13d
..
8fd603b
100644
(file)
--- a/
mm/vmstat.c
+++ b/
mm/vmstat.c
@@
-78,7
+78,7
@@
void vm_events_fold_cpu(int cpu)
*
* vm_stat contains the global counters
*/
*
* vm_stat contains the global counters
*/
-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
+atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS]
__cacheline_aligned_in_smp
;
EXPORT_SYMBOL(vm_stat);
#ifdef CONFIG_SMP
EXPORT_SYMBOL(vm_stat);
#ifdef CONFIG_SMP
@@
-702,6
+702,7
@@
const char * const vmstat_text[] = {
"nr_unstable",
"nr_bounce",
"nr_vmscan_write",
"nr_unstable",
"nr_bounce",
"nr_vmscan_write",
+ "nr_vmscan_immediate_reclaim",
"nr_writeback_temp",
"nr_isolated_anon",
"nr_isolated_file",
"nr_writeback_temp",
"nr_isolated_anon",
"nr_isolated_file",