diff options
| author |   Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2019-09-04 16:55:27 +0200 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2019-09-05 10:39:06 +0200 |
| commit | 5d2295f3a93b04986d069ebeaf5b07725f9096c1 (patch) | |
| tree | 64e4e240fad905210d6b135c1e73f9bde753721d /kernel/time/timekeeping.h | |
| parent | posix-cpu-timers: Make expiry_active check actually work correctly (diff) | |
| download | linux-dev-5d2295f3a93b04986d069ebeaf5b07725f9096c1.tar.xz linux-dev-5d2295f3a93b04986d069ebeaf5b07725f9096c1.zip | |
hrtimer: Add a missing bracket and hide `migration_base' on !SMP
The recent change to avoid taking the expiry lock when a timer is currently
migrated missed to add a bracket at the end of the if statement leading to
compile errors. Since that commit the variable `migration_base' is always
used but it is only available on SMP configuration thus leading to another
compile error. The changelog says "The timer base and base->cpu_base
cannot be NULL in the code path", so it is safe to limit this check to SMP
configurations only.
Add the missing bracket to the if statement and hide `migration_base'
behind CONFIG_SMP bars.
[ tglx: Mark the functions inline ... ]
Fixes: 68b2c8c1e4210 ("hrtimer: Don't take expiry_lock when timer is currently migrated")
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20190904145527.eah7z56ntwobqm6j@linutronix.de
Diffstat (limited to 'kernel/time/timekeeping.h')
0 files changed, 0 insertions, 0 deletions