diff --git a/[refs] b/[refs] index 6fc66ed46658..1284c6d1b202 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3abef4e6c23feef4aa9ab161ae138d6d39ae69f3 +refs/heads/master: 3c0ff4689630b280704666833e9539d84cddc373 diff --git a/trunk/include/linux/vmstat.h b/trunk/include/linux/vmstat.h index a13291f7da88..5fd71a7d0dfd 100644 --- a/trunk/include/linux/vmstat.h +++ b/trunk/include/linux/vmstat.h @@ -85,7 +85,7 @@ static inline void vm_events_fold_cpu(int cpu) #define count_vm_numa_events(x, y) count_vm_events(x, y) #else #define count_vm_numa_event(x) do {} while (0) -#define count_vm_numa_events(x, y) do {} while (0) +#define count_vm_numa_events(x, y) do { (void)(y); } while (0) #endif /* CONFIG_NUMA_BALANCING */ #define __count_zone_vm_events(item, zone, delta) \