From patchwork Wed Mar 7 21:58:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 7140 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 DCF9223E64 for ; Wed, 7 Mar 2012 21:58:39 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id A6191A181D7 for ; Wed, 7 Mar 2012 21:58:39 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so12341121iag.11 for ; Wed, 07 Mar 2012 13:58:39 -0800 (PST) Received: by 10.42.147.199 with SMTP id o7mr2294127icv.50.1331157519445; Wed, 07 Mar 2012 13:58:39 -0800 (PST) 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.53.18 with SMTP id k18csp22991ibg; Wed, 7 Mar 2012 13:58:38 -0800 (PST) Received: by 10.68.132.41 with SMTP id or9mr5884715pbb.8.1331157517884; Wed, 07 Mar 2012 13:58:37 -0800 (PST) Received: from e35.co.us.ibm.com (e35.co.us.ibm.com. [32.97.110.153]) by mx.google.com with ESMTPS id c10si2239149pbd.236.2012.03.07.13.58.37 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Mar 2012 13:58:37 -0800 (PST) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.153 as permitted sender) client-ip=32.97.110.153; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.153 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from /spool/local by e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 7 Mar 2012 14:58:36 -0700 Received: from d01dlp03.pok.ibm.com (9.56.224.17) by e35.co.us.ibm.com (192.168.1.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 7 Mar 2012 14:58:34 -0700 Received: from d01relay06.pok.ibm.com (d01relay06.pok.ibm.com [9.56.227.116]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 41D94C90068; Wed, 7 Mar 2012 16:58:33 -0500 (EST) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay06.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q27LwVt52723970; Wed, 7 Mar 2012 16:58:31 -0500 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q283TNMN016176; Wed, 7 Mar 2012 22:29:24 -0500 Received: from kernel.beaverton.ibm.com (kernel.beaverton.ibm.com [9.47.67.96]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q283TNWu016135; Wed, 7 Mar 2012 22:29:23 -0500 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id 208E2C040C; Wed, 7 Mar 2012 13:58:30 -0800 (PST) From: John Stultz To: lkml Cc: John Stultz , Greg KH , Android Kernel Team Subject: [PATCH 01/13] android: lowmemorykiller: Fix warning on 64bit Date: Wed, 7 Mar 2012 13:58:11 -0800 Message-Id: <1331157503-3413-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.3.2.146.gca209 In-Reply-To: <1331157503-3413-1-git-send-email-john.stultz@linaro.org> References: <1331157503-3413-1-git-send-email-john.stultz@linaro.org> MIME-Version: 1.0 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12030721-6148-0000-0000-000004138DA2 X-Gm-Message-State: ALoCoQml+WwctJV4PpNyXsKkrPJcfWm7P032AFmT4FD+QPTrfiY3sKQ50S38VAQAgJyEPdKEa9eP Fixes the following warning on 64bit: drivers/staging/android/lowmemorykiller.c: In function ‘__check_minfree’: drivers/staging/android/lowmemorykiller.c:215: warning: return from incompatible pointer type CC: Greg KH CC: Android Kernel Team Signed-off-by: John Stultz --- drivers/staging/android/lowmemorykiller.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c index 052b43e..15a59c1 100644 --- a/drivers/staging/android/lowmemorykiller.c +++ b/drivers/staging/android/lowmemorykiller.c @@ -212,7 +212,7 @@ static void __exit lowmem_exit(void) module_param_named(cost, lowmem_shrinker.seeks, int, S_IRUGO | S_IWUSR); module_param_array_named(adj, lowmem_adj, int, &lowmem_adj_size, S_IRUGO | S_IWUSR); -module_param_array_named(minfree, lowmem_minfree, uint, &lowmem_minfree_size, +module_param_array_named(minfree, lowmem_minfree, ulong, &lowmem_minfree_size, S_IRUGO | S_IWUSR); module_param_named(debug_level, lowmem_debug_level, uint, S_IRUGO | S_IWUSR);