Merge tag 'x86_cache_for_v5.17_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit d3c20bfb7493 · 2022-01-10T09:42:36.000-08:00
Pull x86 resource control fixlet from Borislav Petkov:
 "A minor code cleanup removing a redundant assignment"

* tag 'x86_cache_for_v5.17_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/resctrl: Remove redundant assignment to variable chunks
diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c
@@ -282,7 +282,7 @@ static u64 mbm_overflow_count(u64 prev_msr, u64 cur_msr, unsigned int width)
 	u64 shift = 64 - width, chunks;
 
 	chunks = (cur_msr << shift) - (prev_msr << shift);
-	return chunks >>= shift;
+	return chunks >> shift;
 }
 
 static u64 __mon_event_count(u32 rmid, struct rmid_read *rr)

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ static u64 mbm_overflow_count(u64 prev_msr, u64 cur_msr, unsigned int width)`
`282`	`282`	`u64 shift = 64 - width, chunks;`
`283`	`283`
`284`	`284`	`chunks = (cur_msr << shift) - (prev_msr << shift);`
`285`		`- return chunks >>= shift;`
	`285`	`+ return chunks >> shift;`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`static u64 __mon_event_count(u32 rmid, struct rmid_read *rr)`