diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-02-03 19:25:04 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-02-03 19:25:04 +0300 |
| commit | fb3bc36699ac976b0c3e1d27811272a40cee07f5 (patch) | |
| tree | ed7119ecdcc84b37f3a1aeb51819e084c231497b /arch/arm64/include/asm/vdso.h | |
| parent | 8ba792103c60eed2e093d2866441f430d7e306a8 (diff) | |
| parent | 0b5ed2617ffc868673c7916e7469294e5cc2128d (diff) | |
Merge branch 'tracking-ilp32' into merge-linux-linaroll-20150203.0
Diffstat (limited to 'arch/arm64/include/asm/vdso.h')
| -rw-r--r-- | arch/arm64/include/asm/vdso.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/vdso.h b/arch/arm64/include/asm/vdso.h index 839ce0031bd5..84050c613cc3 100644 --- a/arch/arm64/include/asm/vdso.h +++ b/arch/arm64/include/asm/vdso.h @@ -29,6 +29,10 @@ #include <generated/vdso-offsets.h> +#ifdef CONFIG_ARM64_ILP32 +#include <generated/vdso-ilp32-offsets.h> +#endif + #define VDSO_SYMBOL(base, name) \ ({ \ (void *)(vdso_offset_##name - VDSO_LBASE + (unsigned long)(base)); \ |