Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b55ada30 authored by Zhen Lei's avatar Zhen Lei Committed by Greg Kroah-Hartman
Browse files

genirq: Fix the return type of kstat_cpu_irqs_sum() 



[ Upstream commit 47904aed898a08f028572b9b5a5cc101ddfb2d82 ]

The type of member ->irqs_sum is unsigned long, but kstat_cpu_irqs_sum()
returns int, which can result in truncation.  Therefore, change the
kstat_cpu_irqs_sum() function's return value to unsigned long to avoid
truncation.

Fixes: f2c66cd8 ("/proc/stat: scalability of irq num per cpu")
Reported-by: default avatarElliott, Robert (Servers) <elliott@hpe.com>
Signed-off-by: default avatarZhen Lei <thunder.leizhen@huawei.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>
Cc: Josh Don <joshdon@google.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6b9f61c8

include/linux/kernel_stat.h

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ extern unsigned int kstat_irqs_usr(unsigned int irq); 
/*

 * Number of interrupts per cpu, since bootup

 */

static inline unsigned int kstat_cpu_irqs_sum(unsigned int cpu)

static inline unsigned long kstat_cpu_irqs_sum(unsigned int cpu)

{

	return kstat_cpu(cpu).irqs_sum;

}