A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-25 22:23:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "arm: vdso: Fix GENERIC_GETTIMEOFDAY dependencies"

Browse source
This commit is contained in:
qctecmdr 2021-01-05 10:50:54 -08:00 • committed by Gerrit - the friendly Code Review server
commit 14d5ad2a5e
3 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/Kconfig
View file

@ -1277,7 +1277,7 @@ config HAVE_ARM_ARCH_TIMER
depends on CPU_V7
select ARM_ARCH_TIMER
select GENERIC_CLOCKEVENTS
select GENERIC_GETTIMEOFDAY
select GENERIC_GETTIMEOFDAY if HAVE_GENERIC_VDSO
help
This option enables support for the ARM architected timer

18
arch/arm/kernel/vdso.c
View file

@ -276,15 +276,25 @@ static void vdso_write_end(struct vdso_data *vdata)
++vdso_data->seq_count;
}
#ifdef CONFIG_GENERIC_GETTIMEOFDAY
static bool tk_clock_mode_is_archtimer(const struct timekeeper *tk)
{
return
(tk->tkr_mono.clock->archdata.clock_mode == VDSO_CLOCKMODE_ARCHTIMER);
}
#else
static bool tk_clock_mode_is_archtimer(const struct timekeeper *tk)
{
return true;
}
#endif
static bool tk_is_cntvct(const struct timekeeper *tk)
{
if (!IS_ENABLED(CONFIG_ARM_ARCH_TIMER))
return false;
if (tk->tkr_mono.clock->archdata.clock_mode != VDSO_CLOCKMODE_ARCHTIMER)
return false;
return true;
return tk_clock_mode_is_archtimer(tk);
}
/**

5
drivers/clocksource/arm_arch_timer.c
View file

@ -71,7 +71,12 @@ static enum arch_timer_ppi_nr arch_timer_uses_ppi = ARCH_TIMER_VIRT_PPI;
static bool arch_timer_c3stop;
static bool arch_timer_mem_use_virtual;
static bool arch_counter_suspend_stop;
#ifdef CONFIG_GENERIC_GETTIMEOFDAY
static enum vdso_clock_mode vdso_default = VDSO_CLOCKMODE_ARCHTIMER;
#else
static enum vdso_clock_mode vdso_default = VDSO_CLOCKMODE_NONE;
#endif
static cpumask_t evtstrm_available = CPU_MASK_NONE;
static bool evtstrm_enable = IS_ENABLED(CONFIG_ARM_ARCH_TIMER_EVTSTREAM);