- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix.

[linux-flexiantxendom0-3.2.10.git] / include / asm-i386 / mmzone.h

diff --git a/include/asm-i386/mmzone.h b/include/asm-i386/mmzone.h
index 3503ad6..118e981 100644 (file)
--- a/include/asm-i386/mmzone.h
+++ b/include/asm-i386/mmzone.h
@@ -122,21 +122,21 @@ static inline int pfn_valid(int pfn)
        __alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE, 0)
 #define alloc_bootmem_node(pgdat, x)                                   \
 ({                                                                     \
-       struct pglist_data  __attribute__ ((unused))                    \
+       struct pglist_data  __maybe_unused                      \
                                *__alloc_bootmem_node__pgdat = (pgdat); \
        __alloc_bootmem_node(NODE_DATA(0), (x), SMP_CACHE_BYTES,        \
                                                __pa(MAX_DMA_ADDRESS)); \
 })
 #define alloc_bootmem_pages_node(pgdat, x)                             \
 ({                                                                     \
-       struct pglist_data  __attribute__ ((unused))                    \
+       struct pglist_data  __maybe_unused                      \
                                *__alloc_bootmem_node__pgdat = (pgdat); \
        __alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE,              \
                                                __pa(MAX_DMA_ADDRESS))  \
 })
 #define alloc_bootmem_low_pages_node(pgdat, x)                         \
 ({                                                                     \
-       struct pglist_data  __attribute__ ((unused))                    \
+       struct pglist_data  __maybe_unused                      \
                                *__alloc_bootmem_node__pgdat = (pgdat); \
        __alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE, 0);          \
 })