diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-09-09 21:54:49 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-09-09 21:54:49 +0300 |
| commit | a7eab7885a30dfeed5917eaf3c72f962682a56d9 (patch) | |
| tree | fda986976bad7f72986e4bd742e94c2d9f82c19f /arch/arm64/include/asm/vdso.h | |
| parent | af3fc97a799070a5c341acd344cbfce770c6a646 (diff) | |
| parent | 9b4db147ac19c2320edec431d93193f42e32d425 (diff) | |
Automatically merging tracking-ilp32 into merge-linux-linaroll-20150909.0
Conflicting files:
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)); \ |