Commit d3c20bfb authored by Linus Torvalds's avatar Linus Torvalds

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

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
parents 01d5e787 df0114f1
...@@ -282,7 +282,7 @@ static u64 mbm_overflow_count(u64 prev_msr, u64 cur_msr, unsigned int width) ...@@ -282,7 +282,7 @@ static u64 mbm_overflow_count(u64 prev_msr, u64 cur_msr, unsigned int width)
u64 shift = 64 - width, chunks; u64 shift = 64 - width, chunks;
chunks = (cur_msr << shift) - (prev_msr << shift); chunks = (cur_msr << shift) - (prev_msr << shift);
return chunks >>= shift; return chunks >> shift;
} }
static u64 __mon_event_count(u32 rmid, struct rmid_read *rr) static u64 __mon_event_count(u32 rmid, struct rmid_read *rr)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment