From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751321AbeAPDse (ORCPT + 1 other); Mon, 15 Jan 2018 22:48:34 -0500 Received: from terminus.zytor.com ([65.50.211.136]:41165 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750903AbeAPDsd (ORCPT ); Mon, 15 Jan 2018 22:48:33 -0500 Date: Mon, 15 Jan 2018 19:45:10 -0800 From: tip-bot for Anna-Maria Gleixner Message-ID: Cc: linux-kernel@vger.kernel.org, john.stultz@linaro.org, tglx@linutronix.de, peterz@infradead.org, torvalds@linux-foundation.org, hpa@zytor.com, hch@lst.de, mingo@kernel.org, anna-maria@linutronix.de Reply-To: torvalds@linux-foundation.org, hpa@zytor.com, mingo@kernel.org, hch@lst.de, anna-maria@linutronix.de, linux-kernel@vger.kernel.org, john.stultz@linaro.org, tglx@linutronix.de, peterz@infradead.org In-Reply-To: <20171221104205.7269-13-anna-maria@linutronix.de> References: <20171221104205.7269-13-anna-maria@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] hrtimer: Make room in 'struct hrtimer_cpu_base' Git-Commit-ID: da21c5a58a7f30db69e04e06dfb6777ccbb1113c X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Commit-ID: da21c5a58a7f30db69e04e06dfb6777ccbb1113c Gitweb: https://git.kernel.org/tip/da21c5a58a7f30db69e04e06dfb6777ccbb1113c Author: Anna-Maria Gleixner AuthorDate: Thu, 21 Dec 2017 11:41:41 +0100 Committer: Ingo Molnar 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 Cc: Christoph Hellwig Cc: John Stultz Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: keescook@chromium.org Link: http://lkml.kernel.org/r/20171221104205.7269-13-anna-maria@linutronix.de Signed-off-by: Ingo Molnar --- 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];