From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751732AbcFJDxI (ORCPT ); Thu, 9 Jun 2016 23:53:08 -0400 Received: from out1134-186.mail.aliyun.com ([42.120.134.186]:12174 "EHLO out1134-186.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750756AbcFJDxH (ORCPT ); Thu, 9 Jun 2016 23:53:07 -0400 X-Greylist: delayed 303 seconds by postgrey-1.27 at vger.kernel.org; Thu, 09 Jun 2016 23:53:06 EDT X-Alimail-AntiSpam: AC=CONTINUE;BC=0.07445691|-1;FP=0|0|0|0|0|-1|-1|-1;HT=e02c03275;MF=chengang@emindsoft.com.cn;NM=1;PH=DS;RN=13;RT=12;SR=0;TI=SMTPD_----4ucEbUl_1465530464; From: chengang@emindsoft.com.cn To: akpm@linux-foundation.org, trivial@kernel.org Cc: mhocko@suse.cz, dan.j.williams@intel.com, iamjoonsoo.kim@lge.com, vbabka@suse.cz, baiyaowei@cmss.chinamobile.com, vkuznets@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Chen Gang , Chen Gang Subject: [PATCH trivial] include/linux/memory_hotplug.h: Clean up code Date: Fri, 10 Jun 2016 11:47:42 +0800 Message-Id: <1465530462-8285-1-git-send-email-chengang@emindsoft.com.cn> X-Mailer: git-send-email 1.9.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chen Gang Use one line instead of two lines for pgdat_resize_init, since one line is still within 80 columns. Let the second line function parameter almost align with the first line parameter. Use pr_warn instead of printk, so also let the line within 80 columns. Signed-off-by: Chen Gang --- include/linux/memory_hotplug.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 01033fa..714f3ea 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -48,8 +48,7 @@ void pgdat_resize_unlock(struct pglist_data *pgdat, unsigned long *flags) { spin_unlock_irqrestore(&pgdat->node_size_lock, *flags); } -static inline -void pgdat_resize_init(struct pglist_data *pgdat) +static inline void pgdat_resize_init(struct pglist_data *pgdat) { spin_lock_init(&pgdat->node_size_lock); } @@ -105,12 +104,12 @@ extern bool memhp_auto_online; extern bool is_pageblock_removable_nolock(struct page *page); extern int arch_remove_memory(u64 start, u64 size); extern int __remove_pages(struct zone *zone, unsigned long start_pfn, - unsigned long nr_pages); + unsigned long nr_pages); #endif /* CONFIG_MEMORY_HOTREMOVE */ /* reasonably generic interface to expand the physical pages in a zone */ extern int __add_pages(int nid, struct zone *zone, unsigned long start_pfn, - unsigned long nr_pages); + unsigned long nr_pages); #ifdef CONFIG_NUMA extern int memory_add_physaddr_to_nid(u64 start); @@ -223,7 +222,7 @@ static inline void zone_seqlock_init(struct zone *zone) {} static inline int mhp_notimplemented(const char *func) { - printk(KERN_WARNING "%s() called, with CONFIG_MEMORY_HOTPLUG disabled\n", func); + pr_warn("%s() called, with CONFIG_MEMORY_HOTPLUG disabled\n", func); dump_stack(); return -ENOSYS; } @@ -270,18 +269,18 @@ static inline void remove_memory(int nid, u64 start, u64 size) {} #endif /* CONFIG_MEMORY_HOTREMOVE */ extern int walk_memory_range(unsigned long start_pfn, unsigned long end_pfn, - void *arg, int (*func)(struct memory_block *, void *)); + void *arg, int (*func)(struct memory_block *, void *)); extern int add_memory(int nid, u64 start, u64 size); extern int add_memory_resource(int nid, struct resource *resource, bool online); extern int zone_for_memory(int nid, u64 start, u64 size, int zone_default, - bool for_device); + bool for_device); extern int arch_add_memory(int nid, u64 start, u64 size, bool for_device); extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages); extern bool is_memblock_offlined(struct memory_block *mem); extern void remove_memory(int nid, u64 start, u64 size); extern int sparse_add_one_section(struct zone *zone, unsigned long start_pfn); extern void sparse_remove_one_section(struct zone *zone, struct mem_section *ms, - unsigned long map_offset); + unsigned long map_offset); extern struct page *sparse_decode_mem_map(unsigned long coded_mem_map, unsigned long pnum); extern int zone_can_shift(unsigned long pfn, unsigned long nr_pages, -- 1.9.3