From patchwork Mon Jun 25 08:47:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 9596 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 90CC823EE9 for ; Mon, 25 Jun 2012 08:48:13 +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 4AA5AA18511 for ; Mon, 25 Jun 2012 08:48:13 +0000 (UTC) Received: by ggnf1 with SMTP id f1so2828542ggn.11 for ; Mon, 25 Jun 2012 01:48:12 -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=m8e99JfROHwE+tuNWR8pNgJSddt+79kk/zwgiXeXIcdfrHUbIiUaJJhtsfr2pUO0pn i2w7UUZsmyucawy9fgmMOBpA5TjL8AtvI7Pzb7ek+kKX/iQGVyJ+4cSNIyOxdipgPB96 j/FXw/9zutCirxzYJZvkqBeQg+EjcoKnPL8tnDJV6gyFQhX9+3UMN6fZOh/HVdb6vujR O8iOGK9hOr8jQTzvsEA4eDRxutbKZnhWMxBPhmbBep7acV8ZLoi2aBwwAE0ZhI0Ay7GV SFRfCPP545ljthItYdgNFA5vh5Qp2zupZhGk+JPovVYWksSnccnjpbWmf+nzb2K4IXL3 W9zQ== Received: by 10.50.57.167 with SMTP id j7mr7416349igq.53.1340614092632; Mon, 25 Jun 2012 01:48:12 -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.231.24.148 with SMTP id v20csp37089ibb; Mon, 25 Jun 2012 01:48:11 -0700 (PDT) Received: by 10.204.156.22 with SMTP id u22mr3626907bkw.22.1340614090528; Mon, 25 Jun 2012 01:48:10 -0700 (PDT) Received: from mombin.canonical.com (mombin.canonical.com. [91.189.95.16]) by mx.google.com with ESMTP id ge18si10562448bkc.8.2012.06.25.01.48.09; Mon, 25 Jun 2012 01:48:10 -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 1Sj4xp-0007Oj-Vv; Mon, 25 Jun 2012 08:48:06 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Sj4xk-0007Lm-3Z for linaro-mm-sig@lists.linaro.org; Mon, 25 Jun 2012 08:48:00 +0000 Received: from epcpsbgm2.samsung.com (mailout2.samsung.com [203.254.224.25]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0M66002PR0EMBTU0@mailout2.samsung.com> for linaro-mm-sig@lists.linaro.org; Mon, 25 Jun 2012 17:47:58 +0900 (KST) X-AuditID: cbfee61b-b7fcc6d000003a7a-93-4fe825be7b87 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id C3.D2.14970.EB528EF4; Mon, 25 Jun 2012 17:47:58 +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 <0M66003WI0FB4UA0@mmp2.samsung.com> for linaro-mm-sig@lists.linaro.org; Mon, 25 Jun 2012 17:47:58 +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: Mon, 25 Jun 2012 10:47:26 +0200 Message-id: <1340614047-5824-2-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.7.10 In-reply-to: <1340614047-5824-1-git-send-email-m.szyprowski@samsung.com> References: <1340614047-5824-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMJMWRmVeSWpSXmKPExsVy+t9jQd19qi/8DRqPCVh8ufKQyYHR4/a/ x8wBjFFcNimpOZllqUX6dglcGe8XTWMsWKResbvtDVMD4xz5LkZODgkBE4lHL3ezQNhiEhfu rWfrYuTiEBKYziix8+0SZghnLZPEo8vTWUGq2AQMJbredgFVcXCICNRIzJvBCFLDLDCXWeLe zp/sIDXCAh4SJx/dZQKxWQRUJT4tfAJm8wq4S0zc9pgNYpu8xNP7fWA2J1D9zvvrwK4QAqqZ 82cu4wRG3gWMDKsYRVMLkguKk9JzjfSKE3OLS/PS9ZLzczcxgr3+THoH46oGi0OMAhyMSjy8 akov/IVYE8uKK3MPMUpwMCuJ8HIwAoV4UxIrq1KL8uOLSnNSiw8xSnOwKInzNllf8BcSSE8s Sc1OTS1ILYLJMnFwSjUwCtmUN/wMvP35wGmNyAeHHyS1PHsd/sXuNmdmV08il5TU4iLmV+x7 o/luLTGPOm1xqMw35m+PJNvN49IuG2OT5iy75JL1hsl99boEm4PqxS7Gqqzn50VNWJba/v6g 2tuSCN4Zc45vuiN/0yHpnJhh6kunir/zzi0/Yn+hfHqASKv7gnCTfSHPlFiKMxINtZiLihMB 3PmmAvYBAAA= X-TM-AS-MML: No Cc: Russell King - ARM Linux , Arnd Bergmann , Konrad Rzeszutek Wilk , Kyungmin Park , Minchan Kim Subject: [Linaro-mm-sig] [PATCHv4 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: ALoCoQnch+OBZ6li7VqUVWmrcBY4jhpev86ACRkf/ZwyC9gp6pVAMjtGlxULUlIaYJd+ssv9M1S0 '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);