Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

UPSTREAM: vdso: Fix clocksource.h macro detection

Browse source 
CONFIG_GENERIC_GETTIMEOFDAY is a sufficient condition to verify if an
architecture implements asm/vdso/clocksource.h or not. The current
implementation wrongly assumes that the same is true for the config
option CONFIG_ARCH_CLOCKSOURCE_DATA.

This results in a series of build errors on ia64/sparc/sparc64 like this:

  In file included from ./include/linux/clocksource.h:31,
                   from ./include/linux/clockchips.h:14,
                   from ./include/linux/tick.h:8,
                   from fs/proc/stat.c:15:
  ./include/vdso/clocksource.h:9:10: fatal error: asm/vdso/clocksource.h:
  No such file or directory
      9 | #include <asm/vdso/clocksource.h>
        |          ^~~~~~~~~~~~~~~~~~~~~~~~

Fix the issue removing the unneeded config condition.

Fixes: 14ee2ac618e4 ("linux/clocksource.h: Extract common header for vDSO")
Reported-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20200323133920.46546-1-vincenzo.frascino@arm.com
(cherry picked from commit ca214e2c1793058e3a1387f9e343cc5b1731db15)
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 154668398
Change-Id: I5f8fbfb692ad69a114e1121df0755fa868d9f5ef
This commit is contained in:
Vincenzo Frascino 2020-03-23 13:39:20 +00:00 committed by Mark Salyzyn
parent de1774a9d2
commit 77f35d3b66
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/vdso/clocksource.h
View file

@ -4,10 +4,9 @@
#include <vdso/limits.h> #include <vdso/limits.h>
#if defined(CONFIG_ARCH_CLOCKSOURCE_DATA) || \ #ifdef CONFIG_GENERIC_GETTIMEOFDAY
defined(CONFIG_GENERIC_GETTIMEOFDAY)
#include <asm/vdso/clocksource.h> #include <asm/vdso/clocksource.h>
#endif /* CONFIG_ARCH_CLOCKSOURCE_DATA || CONFIG_GENERIC_GETTIMEOFDAY */ #endif /* CONFIG_GENERIC_GETTIMEOFDAY */
enum vdso_clock_mode { enum vdso_clock_mode {
VDSO_CLOCKMODE_NONE, VDSO_CLOCKMODE_NONE,