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 <a...@arndb.de>
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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
