--- zzzz-none-000/linux-2.6.28.10/include/linux/memory_hotplug.h 2009-05-02 18:54:43.000000000 +0000 +++ fusiv-7390-686/linux-2.6.28.10/include/linux/memory_hotplug.h 2009-10-14 11:28:36.000000000 +0000 @@ -80,7 +80,7 @@ #ifdef CONFIG_NUMA extern int memory_add_physaddr_to_nid(u64 start); #else -static inline int memory_add_physaddr_to_nid(u64 start) +static inline int memory_add_physaddr_to_nid(u64 start __attribute__ ((unused))) { return 0; } @@ -132,25 +132,25 @@ #else /* !CONFIG_NUMA */ /* never called */ -static inline pg_data_t *generic_alloc_nodedata(int nid) +static inline pg_data_t *generic_alloc_nodedata(int nid __attribute__ ((unused))) { BUG(); return NULL; } -static inline void generic_free_nodedata(pg_data_t *pgdat) +static inline void generic_free_nodedata(pg_data_t *pgdat __attribute__ ((unused))) { } -static inline void arch_refresh_nodedata(int nid, pg_data_t *pgdat) +static inline void arch_refresh_nodedata(int nid, pg_data_t *pgdat __attribute__ ((unused))) { } #endif /* CONFIG_NUMA */ #endif /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */ #ifdef CONFIG_SPARSEMEM_VMEMMAP -static inline void register_page_bootmem_info_node(struct pglist_data *pgdat) +static inline void register_page_bootmem_info_node(struct pglist_data *pgdat __attribute__ ((unused))) { } -static inline void put_page_bootmem(struct page *page) +static inline void put_page_bootmem(struct page *page __attribute__ ((unused))) { } #else @@ -162,21 +162,21 @@ /* * Stub functions for when hotplug is off */ -static inline void pgdat_resize_lock(struct pglist_data *p, unsigned long *f) {} -static inline void pgdat_resize_unlock(struct pglist_data *p, unsigned long *f) {} -static inline void pgdat_resize_init(struct pglist_data *pgdat) {} +static inline void pgdat_resize_lock(struct pglist_data *p __attribute__ ((unused)), unsigned long *f __attribute__ ((unused))) {} +static inline void pgdat_resize_unlock(struct pglist_data *p __attribute__ ((unused)), unsigned long *f __attribute__ ((unused))) {} +static inline void pgdat_resize_init(struct pglist_data *pgdat __attribute__ ((unused))) {} -static inline unsigned zone_span_seqbegin(struct zone *zone) +static inline unsigned zone_span_seqbegin(struct zone *zone __attribute__ ((unused))) { return 0; } -static inline int zone_span_seqretry(struct zone *zone, unsigned iv) +static inline int zone_span_seqretry(struct zone *zone __attribute__ ((unused)), unsigned iv __attribute__ ((unused))) { return 0; } -static inline void zone_span_writelock(struct zone *zone) {} -static inline void zone_span_writeunlock(struct zone *zone) {} -static inline void zone_seqlock_init(struct zone *zone) {} +static inline void zone_span_writelock(struct zone *zone __attribute__ ((unused))) {} +static inline void zone_span_writeunlock(struct zone *zone __attribute__ ((unused))) {} +static inline void zone_seqlock_init(struct zone *zone __attribute__ ((unused))) {} static inline int mhp_notimplemented(const char *func) { @@ -185,7 +185,7 @@ return -ENOSYS; } -static inline void register_page_bootmem_info_node(struct pglist_data *pgdat) +static inline void register_page_bootmem_info_node(struct pglist_data *pgdat __attribute__ ((unused))) { } @@ -204,8 +204,8 @@ extern int is_mem_section_removable(unsigned long pfn, unsigned long nr_pages); #else -static inline int is_mem_section_removable(unsigned long pfn, - unsigned long nr_pages) +static inline int is_mem_section_removable(unsigned long pfn __attribute__ ((unused)), + unsigned long nr_pages __attribute__ ((unused))) { return 0; }