[<prev] [next>] [day] [month] [year] [list]
Message-ID: <156706083595.5671.10077704238426235734.tip-bot2@tip-bot2>
Date: Thu, 29 Aug 2019 06:40:35 -0000
From: "tip-bot2 for Thomas Gleixner" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Ingo Molnar <mingo@...nel.org>,
Thomas Gleixner <tglx@...utronix.de>,
Borislav Petkov <bp@...en8.de>, linux-kernel@...r.kernel.org
Subject: [tip: timers/core] posix-timers: Unbreak CONFIG_POSIX_TIMERS=n build
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 8f2edb4a78f7f5fa35c025849152b1d2dfaee4eb
Gitweb: https://git.kernel.org/tip/8f2edb4a78f7f5fa35c025849152b1d2dfaee4eb
Author: Thomas Gleixner <tglx@...utronix.de>
AuthorDate: Thu, 29 Aug 2019 08:19:40 +02:00
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitterDate: Thu, 29 Aug 2019 08:25:21 +02:00
posix-timers: Unbreak CONFIG_POSIX_TIMERS=n build
The rework of the posix-cpu-timers patch series dropped the empty
declaration of struct cpu_timer for the CONFIG_POSIX_TIMERS=n case which
causes the build to fail:
./include/linux/posix-timers.h:218:20: error: field 'cpu' has incomplete type
Add it back.
Fixes: 60bda037f1dd ("posix-cpu-timers: Utilize timerqueue for storage")
Reported-by: Ingo Molnar <mingo@...nel.org>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
include/linux/posix-timers.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
index f9fbb4c..e685916 100644
--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
@@ -161,6 +161,7 @@ static inline void posix_cputimers_rt_watchdog(struct posix_cputimers *pct,
},
#else
struct posix_cputimers { };
+struct cpu_timer { };
#define INIT_CPU_TIMERS(s)
static inline void posix_cputimers_init(struct posix_cputimers *pct) { }
static inline void posix_cputimers_group_init(struct posix_cputimers *pct,
Powered by blists - more mailing lists