From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752668AbbJGJZz (ORCPT ); Wed, 7 Oct 2015 05:25:55 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:53073 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752395AbbJGJZx (ORCPT ); Wed, 7 Oct 2015 05:25:53 -0400 From: Arnd Bergmann To: gregkh@linuxfoundation.org Cc: Alexander Shishkin , linux-kernel@vger.kernel.org Subject: [PATCH] intel_th: fix compile warning Date: Wed, 07 Oct 2015 11:25:47 +0200 Message-ID: <4973464.lbBncgkGPs@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:n+CFIGpaBICiY45UbfS/6Qr13MB+WmVh5zWrQ5GN+1bVbscIhLb W7FOnkinrXUIXwIelZzm98tGQwlYLb2Q6JJRKnxqHcIUcIOULL+N8ZEyUlLheKoiM8liOjJ gLrI+vQBAArnu3VhFuHOIv7n6tT8oXSlqHG7ULk0gauBxosR+qMM/F0dv5K6qTShC4ZYuTm N9GnmzbjX25VVTMdd3IMA== X-UI-Out-Filterresults: notjunk:1;V01:K0:Eo4wyKnW7Ds=:vqLTDK+7xMM3ritQETp1RN CFj/JvQnBPShMbbJXqGrkkBb4vkmO9VsOAazZeWrrXV9F7bvmOL1xOQJY/XNUu9Qt0fzqLENy pdkgAeACx9jjZ+5XHhHeNKZl8FDx9FWjcXjo/Wqe70JmM49Vk2DyOihQM4s3TTsc8MAvPunsT B79AnJrKlXu7RmdXq4yFcCH2IZ2CGwr5sMvDnK2scChginhmjvX3/224NHE6VRPMQKQRcI6CC 4TvZH+/Epmef8Mf4vpQLT9w4mHZZn7SacHBGJPwpKI+D8IXVC5u48T3jvAGA0c8s7aGOzoW4r gFTrDuX6hJcRpM4mHkjFAwOtBmTZ9NVhQcJduhgomjUOOv3K1gYD/Cz4pFT/rTD3QGSynpqE/ dd7q6B5bfhXxwgIerDmUvWY85eSmxwSL4C1YFZOdn3FNVMB6SFczEZ3u71ImpeFUjxC/TzRrm FW4gbibATt2W6+X9DhwjHCvF4FJuDV3ugIOBDNRx6EDjoOb3oHsTVYKQYTiQUwQQ3iRS+5RQm Dy4Wb3sH53o3rkuii0uw9kykTDMnZ89i7Zi74SH6TerAXW4/ymPumDb2I+HXR6bYJEV3VD3O4 PURgPihdN0GSVv1GQFTsKBlfIBR4WDa3JMhC9W78DPMYjTAiqHLci8AGar6Exq13l1SpFpbC/ GuEyT5Q0pUQ6p2vhwyahgAOj6hdQEfiQ3nx8/mTFTwYQ1sL9GXVZq9AaiSoUi5hvzp84QiN4c zb1zcWxMb1aIP+G3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The newly added MSU portion of the intel_th driver causes a harmless compile warning on 32-bit kernels: drivers/hwtracing/intel_th/msu.c: In function 'msc_single_to_user': include/linux/kernel.h:724:17: warning: comparison of distinct pointer types lacks a cast This changes the code to use min_t() to force the correct type and avoid that warning, which seems easier than changing the code to use consistent types everywhere. Signed-off-by: Arnd Bergmann diff --git a/drivers/hwtracing/intel_th/msu.c b/drivers/hwtracing/intel_th/msu.c index 99f7662e27f1..4c6688a64db3 100644 --- a/drivers/hwtracing/intel_th/msu.c +++ b/drivers/hwtracing/intel_th/msu.c @@ -1062,7 +1062,7 @@ msc_single_to_user(struct msc *msc, char __user *buf, loff_t off, size_t len) if (msc->single_wrap) { start += msc->single_sz; if (start < size) { - tocopy = min(rem, size - start); + tocopy = min_t(size_t, rem, size - start); if (copy_to_user(buf, msc->base + start, tocopy)) return -EFAULT; @@ -1073,7 +1073,7 @@ msc_single_to_user(struct msc *msc, char __user *buf, loff_t off, size_t len) start &= size - 1; if (rem) { - tocopy = min(rem, msc->single_sz - start); + tocopy = min_t(size_t, rem, msc->single_sz - start); if (copy_to_user(buf, msc->base + start, tocopy)) return -EFAULT;