From patchwork Fri Jul 27 12:03:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 10305 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id E6A1D2402A for ; Fri, 27 Jul 2012 12:04:24 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id 8D1F2A1865F for ; Fri, 27 Jul 2012 12:04:24 +0000 (UTC) Received: by ggnf1 with SMTP id f1so3068036ggn.11 for ; Fri, 27 Jul 2012 05:04:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:x-auditid :from:to:date:message-id:x-mailer:in-reply-to:references :x-brightmail-tracker:x-tm-as-mml:cc:subject:x-beenthere :x-mailman-version:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:sender:errors-to:x-gm-message-state; bh=VMgi0+PbRiTnHitS6PZafDCLNBgkF1Xht7IORUkGd0s=; b=QJserFEVDYkOLQSYHk6KLK6fxLTYWzs0f8W//SZXd39S6anwviq2dMgZ49JSqaXgoI ehpt5MoGzNuwWLVWW6GUjssKQy/7Dm90wNKb1S2yIpQPmIA4+MXTcUDzSTshfZ7qZ93R FRTbv3gAmHDXXRHmkq7k5AUO9yCgiqBtNX36ezpUt7iaXxTrDbjrQbTPfD5kRcVdVdRz 3NbHRmJbmM2KUARzDTXRvE6490AhhloxH/KKmXXjm3wRS5fuvu1bZl0RlW5JDD7lhZ3b Gb0Geb+h2obyvDxpLJOE4n4UkrsCIN6UQzhlMnFi0oaUr8cTsBWd43C0G/3QZmxe1bWz OXWQ== Received: by 10.50.182.229 with SMTP id eh5mr4377429igc.38.1343390663626; Fri, 27 Jul 2012 05:04:23 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.43.93.3 with SMTP id bs3csp27709icc; Fri, 27 Jul 2012 05:04:22 -0700 (PDT) Received: by 10.180.104.197 with SMTP id gg5mr5658192wib.9.1343390662212; Fri, 27 Jul 2012 05:04:22 -0700 (PDT) Received: from mombin.canonical.com (mombin.canonical.com. [91.189.95.16]) by mx.google.com with ESMTP id y56si2555607wec.50.2012.07.27.05.04.21; Fri, 27 Jul 2012 05:04:22 -0700 (PDT) Received-SPF: neutral (google.com: 91.189.95.16 is neither permitted nor denied by best guess record for domain of linaro-mm-sig-bounces@lists.linaro.org) client-ip=91.189.95.16; Authentication-Results: mx.google.com; spf=neutral (google.com: 91.189.95.16 is neither permitted nor denied by best guess record for domain of linaro-mm-sig-bounces@lists.linaro.org) smtp.mail=linaro-mm-sig-bounces@lists.linaro.org Received: from localhost ([127.0.0.1] helo=mombin.canonical.com) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SujHH-0003gk-Bh; Fri, 27 Jul 2012 12:04:19 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SujHF-0003gY-DG for linaro-mm-sig@lists.linaro.org; Fri, 27 Jul 2012 12:04:18 +0000 Received: from epcpsbgm1.samsung.com (mailout1.samsung.com [203.254.224.24]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0M7T009BRIV3SJQ0@mailout1.samsung.com> for linaro-mm-sig@lists.linaro.org; Fri, 27 Jul 2012 21:04:15 +0900 (KST) X-AuditID: cbfee61a-b7f616d000004b7e-bc-501283bfe6f1 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 14.09.19326.FB382105; Fri, 27 Jul 2012 21:04:15 +0900 (KST) Received: from mcdsrvbld02.digital.local ([106.116.37.23]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0M7T00HELIUD2SA0@mmp2.samsung.com> for linaro-mm-sig@lists.linaro.org; Fri, 27 Jul 2012 21:04:15 +0900 (KST) From: Marek Szyprowski To: linux-arm-kernel@lists.infradead.org, linaro-mm-sig@lists.linaro.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Date: Fri, 27 Jul 2012 14:03:38 +0200 Message-id: <1343390619-20456-2-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.7.10 In-reply-to: <1343390619-20456-1-git-send-email-m.szyprowski@samsung.com> References: <1343390619-20456-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrIJMWRmVeSWpSXmKPExsVy+t9jQd39zUIBBn+PGFt8ufKQyYHR4/a/ x8wBjFFcNimpOZllqUX6dglcGe8XTWMsWKResbvtDVMD4xz5LkYODgkBE4nbP0W7GDmBTDGJ C/fWs3UxcnEICUxnlDj97DiUs5ZJYvX3HewgVWwChhJdb7vYQJpFBGok5s1gBKlhFpjLLHFv 50+wGmEBD4kj05uYQWpYBFQlPu73BwnzAoWnfTzDBrFMXuLp/T4wm1PAU+LvtZdgthBQzYuf u9knMPIuYGRYxSiaWpBcUJyUnmuoV5yYW1yal66XnJ+7iRHs8WdSOxhXNlgcYhTgYFTi4Z3I KxQgxJpYVlyZe4hRgoNZSYT3qy1QiDclsbIqtSg/vqg0J7X4EKM0B4uSOK+x91d/IYH0xJLU 7NTUgtQimCwTB6dUA6PhM8HTnd4eSV+aoj8v3X3oumVjBeexhav+/SnUk1rAKzkp64Blzyo9 +yuLeacdE1q6lzHi/CtG23lbHjuvENCL+Kq0KerhnuvXOZYt5L5r++3mvscivu3fs5c7FnJf 2HRVfu7tna9TXfLTEr7vySzSuhrPt8t87k2m+/9/JyQeff7SgXGaZvo7JZbijERDLeai4kQA QNH6zPQBAAA= X-TM-AS-MML: No Cc: Russell King - ARM Linux , Arnd Bergmann , Konrad Rzeszutek Wilk , Kyungmin Park , Minchan Kim Subject: [Linaro-mm-sig] [PATCHv5 1/2] mm: vmalloc: use const void * for caller argument X-BeenThere: linaro-mm-sig@lists.linaro.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Unified memory management interest group." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linaro-mm-sig-bounces@lists.linaro.org Errors-To: linaro-mm-sig-bounces@lists.linaro.org X-Gm-Message-State: ALoCoQlhHDjnSOHOFVKKmKk+08ppVs3oGbrU/oPYwCA3kiW8TumfbWyX7sRdBt+RqgksjFgDlSfF 'const void *' is a safer type for caller function type. This patch updates all references to caller function type. Signed-off-by: Marek Szyprowski Reviewed-by: Kyungmin Park Reviewed-by: Minchan Kim --- include/linux/vmalloc.h | 8 ++++---- mm/vmalloc.c | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index dcdfc2b..2e28f4d 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -32,7 +32,7 @@ struct vm_struct { struct page **pages; unsigned int nr_pages; phys_addr_t phys_addr; - void *caller; + const void *caller; }; /* @@ -62,7 +62,7 @@ extern void *vmalloc_32_user(unsigned long size); extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot); extern void *__vmalloc_node_range(unsigned long size, unsigned long align, unsigned long start, unsigned long end, gfp_t gfp_mask, - pgprot_t prot, int node, void *caller); + pgprot_t prot, int node, const void *caller); extern void vfree(const void *addr); extern void *vmap(struct page **pages, unsigned int count, @@ -85,13 +85,13 @@ static inline size_t get_vm_area_size(const struct vm_struct *area) extern struct vm_struct *get_vm_area(unsigned long size, unsigned long flags); extern struct vm_struct *get_vm_area_caller(unsigned long size, - unsigned long flags, void *caller); + unsigned long flags, const void *caller); extern struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags, unsigned long start, unsigned long end); extern struct vm_struct *__get_vm_area_caller(unsigned long size, unsigned long flags, unsigned long start, unsigned long end, - void *caller); + const void *caller); extern struct vm_struct *remove_vm_area(const void *addr); extern int map_vm_area(struct vm_struct *area, pgprot_t prot, diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 2aad499..11308f0 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1280,7 +1280,7 @@ DEFINE_RWLOCK(vmlist_lock); struct vm_struct *vmlist; static void setup_vmalloc_vm(struct vm_struct *vm, struct vmap_area *va, - unsigned long flags, void *caller) + unsigned long flags, const void *caller) { vm->flags = flags; vm->addr = (void *)va->va_start; @@ -1306,7 +1306,7 @@ static void insert_vmalloc_vmlist(struct vm_struct *vm) } static void insert_vmalloc_vm(struct vm_struct *vm, struct vmap_area *va, - unsigned long flags, void *caller) + unsigned long flags, const void *caller) { setup_vmalloc_vm(vm, va, flags, caller); insert_vmalloc_vmlist(vm); @@ -1314,7 +1314,7 @@ static void insert_vmalloc_vm(struct vm_struct *vm, struct vmap_area *va, static struct vm_struct *__get_vm_area_node(unsigned long size, unsigned long align, unsigned long flags, unsigned long start, - unsigned long end, int node, gfp_t gfp_mask, void *caller) + unsigned long end, int node, gfp_t gfp_mask, const void *caller) { struct vmap_area *va; struct vm_struct *area; @@ -1375,7 +1375,7 @@ EXPORT_SYMBOL_GPL(__get_vm_area); struct vm_struct *__get_vm_area_caller(unsigned long size, unsigned long flags, unsigned long start, unsigned long end, - void *caller) + const void *caller) { return __get_vm_area_node(size, 1, flags, start, end, -1, GFP_KERNEL, caller); @@ -1397,7 +1397,7 @@ struct vm_struct *get_vm_area(unsigned long size, unsigned long flags) } struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags, - void *caller) + const void *caller) { return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END, -1, GFP_KERNEL, caller); @@ -1568,9 +1568,9 @@ EXPORT_SYMBOL(vmap); static void *__vmalloc_node(unsigned long size, unsigned long align, gfp_t gfp_mask, pgprot_t prot, - int node, void *caller); + int node, const void *caller); static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, - pgprot_t prot, int node, void *caller) + pgprot_t prot, int node, const void *caller) { const int order = 0; struct page **pages; @@ -1643,7 +1643,7 @@ fail: */ void *__vmalloc_node_range(unsigned long size, unsigned long align, unsigned long start, unsigned long end, gfp_t gfp_mask, - pgprot_t prot, int node, void *caller) + pgprot_t prot, int node, const void *caller) { struct vm_struct *area; void *addr; @@ -1699,7 +1699,7 @@ fail: */ static void *__vmalloc_node(unsigned long size, unsigned long align, gfp_t gfp_mask, pgprot_t prot, - int node, void *caller) + int node, const void *caller) { return __vmalloc_node_range(size, align, VMALLOC_START, VMALLOC_END, gfp_mask, prot, node, caller);