diff options
| author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
| commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
| tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /mm/vmstat.c | |
| parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
| download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 | |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'mm/vmstat.c')
| -rw-r--r-- | mm/vmstat.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mm/vmstat.c b/mm/vmstat.c index 20c18b7..bdf534a 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -78,7 +78,11 @@ void vm_events_fold_cpu(int cpu) * * vm_stat contains the global counters */ +#ifndef CONFIG_DMA_CMA atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS]; +#else +atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp; +#endif EXPORT_SYMBOL(vm_stat); #ifdef CONFIG_SMP @@ -613,6 +617,9 @@ static char * const migratetype_names[MIGRATE_TYPES] = { "Reclaimable", "Movable", "Reserve", +#ifdef CONFIG_DMA_CMA + "CMA", +#endif "Isolate", }; @@ -718,6 +725,9 @@ const char * const vmstat_text[] = { "numa_other", #endif "nr_anon_transparent_hugepages", +#ifdef CONFIG_DMA_CMA + "nr_free_cma", +#endif "nr_dirty_threshold", "nr_dirty_background_threshold", |