Commit-ID:  da21c5a58a7f30db69e04e06dfb6777ccbb1113c
Gitweb:     https://git.kernel.org/tip/da21c5a58a7f30db69e04e06dfb6777ccbb1113c
Author:     Anna-Maria Gleixner <[email protected]>
AuthorDate: Thu, 21 Dec 2017 11:41:41 +0100
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 16 Jan 2018 02:35:46 +0100

hrtimer: Make room in 'struct hrtimer_cpu_base'

The upcoming softirq based hrtimers support requires an additional field in
the hrtimer_cpu_base struct, which would grow the struct size beyond a
cache line.

The hrtimer_cpu_base::nr_retries and ::nr_hangs members are solely
used for diagnostic output and have no requirement to be 'unsigned int'.

Make them 'unsigned short' to create room for the new struct member.

No functional change.

Signed-off-by: Anna-Maria Gleixner <[email protected]>
Cc: Christoph Hellwig <[email protected]>
Cc: John Stultz <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
 include/linux/hrtimer.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 1bae7b9..56e56bc 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -189,8 +189,8 @@ struct hrtimer_cpu_base {
        ktime_t                         expires_next;
        struct hrtimer                  *next_timer;
        unsigned int                    nr_events;
-       unsigned int                    nr_retries;
-       unsigned int                    nr_hangs;
+       unsigned short                  nr_retries;
+       unsigned short                  nr_hangs;
        unsigned int                    max_hang_time;
 #endif
        struct hrtimer_clock_base       clock_base[HRTIMER_MAX_CLOCK_BASES];

Reply via email to