[PATCH] intel_th: fix compile warning

[PATCH] intel_th: fix compile warning

[Arnd Bergmann]

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 <arnd@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;
 

Re: [PATCH] intel_th: fix compile warning

[Alexander Shishkin]

Arnd Bergmann <arnd@arndb.de> writes:

> 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.

This from yesterday:
http://marc.info/?l=linux-kernel&m=144412498425492

Regards,
--
Alex