diff options
| author | Jens Axboe <axboe@kernel.dk> | 2011-10-19 08:30:42 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2011-10-19 08:30:42 -0400 |
| commit | 5c04b426f2e8b46cfc7969a35b2631063a3c646c (patch) | |
| tree | 2d27d9f5d2fe5d5e8fbc01a467ec58bcb50235c1 /mm/vmstat.c | |
| parent | 499337bb6511e665a236a6a947f819d98ea340c6 (diff) | |
| parent | 899e3ee404961a90b828ad527573aaaac39f0ab1 (diff) | |
Merge branch 'v3.1-rc10' into for-3.2/core
Conflicts:
block/blk-core.c
include/linux/blkdev.h
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'mm/vmstat.c')
| -rw-r--r-- | mm/vmstat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/vmstat.c b/mm/vmstat.c index 20c18b7694b2..d52b13d28e8f 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c | |||
| @@ -659,7 +659,7 @@ static void walk_zones_in_node(struct seq_file *m, pg_data_t *pgdat, | |||
| 659 | } | 659 | } |
| 660 | #endif | 660 | #endif |
| 661 | 661 | ||
| 662 | #if defined(CONFIG_PROC_FS) || defined(CONFIG_SYSFS) | 662 | #if defined(CONFIG_PROC_FS) || defined(CONFIG_SYSFS) || defined(CONFIG_NUMA) |
| 663 | #ifdef CONFIG_ZONE_DMA | 663 | #ifdef CONFIG_ZONE_DMA |
| 664 | #define TEXT_FOR_DMA(xx) xx "_dma", | 664 | #define TEXT_FOR_DMA(xx) xx "_dma", |
| 665 | #else | 665 | #else |
| @@ -788,7 +788,7 @@ const char * const vmstat_text[] = { | |||
| 788 | 788 | ||
| 789 | #endif /* CONFIG_VM_EVENTS_COUNTERS */ | 789 | #endif /* CONFIG_VM_EVENTS_COUNTERS */ |
| 790 | }; | 790 | }; |
| 791 | #endif /* CONFIG_PROC_FS || CONFIG_SYSFS */ | 791 | #endif /* CONFIG_PROC_FS || CONFIG_SYSFS || CONFIG_NUMA */ |
| 792 | 792 | ||
| 793 | 793 | ||
| 794 | #ifdef CONFIG_PROC_FS | 794 | #ifdef CONFIG_PROC_FS |