Re: [PATCH] /fs/proc/meminfo.c: fix compilation error

From: Claudio Scordino
Date: Thu Nov 17 2011 - 03:43:44 EST


Il 17/11/2011 06:06, David Rientjes ha scritto:
> On Thu, 3 Nov 2011, Claudio Scordino wrote:
>
>> diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
>> index 5861741..80e4645 100644
>> --- a/fs/proc/meminfo.c
>> +++ b/fs/proc/meminfo.c
>> @@ -131,12 +131,13 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
>> K(i.freeswap),
>> K(global_page_state(NR_FILE_DIRTY)),
>> K(global_page_state(NR_WRITEBACK)),
>> - K(global_page_state(NR_ANON_PAGES)
>> #ifdef CONFIG_TRANSPARENT_HUGEPAGE
>> + K(global_page_state(NR_ANON_PAGES)
>> + global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
>> - HPAGE_PMD_NR
>> + HPAGE_PMD_NR),
>> +#else
>> + K(global_page_state(NR_ANON_PAGES)),
>> #endif
>> - ),
>> K(global_page_state(NR_FILE_MAPPED)),
>> K(global_page_state(NR_SHMEM)),
>> K(global_page_state(NR_SLAB_RECLAIMABLE) +
>
> Looks like this needs to be fixed for the per-node sysfs meminfo files as
> well? See node_read_meminfo() in drivers/base/node.c.

Hi David,

that file cannot be compiled for the cris architecture
(therefore, with the compiler that gave me the error) because
CONFIG_NUMA cannot be defined for the cris architecture.

However, I forced make to build also that file, and actually I got the
same error (i.e., "directives may not be used inside a macro argument").

Since Andrew already took the patch for the meminfo.c file, I'm going to
send a further patch for this specific file.

Let me know if instead you prefer to have a single patch for both files.

Best regards,

Claudio
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/