diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-22 14:56:29 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-22 14:56:29 +0800 |
| commit | a7a69d5927d3dbe7c9f1a214bed573459754b3dd (patch) | |
| tree | 5432ad6591c496312e0cf0349184afeadae58cfc /arch | |
| parent | 917a9133a6b3c6cc2b6b5649d28c617a4ccac3e6 (diff) | |
| parent | 89663178b45e08d1c928b137d17eb7722fbe5f28 (diff) | |
Merge branch 'v4.4/topic/ro-vdso' into linux-linaro-lsk-v4.4
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/kernel/vdso/vdso.S | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/kernel/vdso/vdso.S b/arch/arm64/kernel/vdso/vdso.S index 60c1db54b41a..82379a70ef03 100644 --- a/arch/arm64/kernel/vdso/vdso.S +++ b/arch/arm64/kernel/vdso/vdso.S @@ -21,9 +21,8 @@ #include <linux/const.h> #include <asm/page.h> - __PAGE_ALIGNED_DATA - .globl vdso_start, vdso_end + .section .rodata .balign PAGE_SIZE vdso_start: .incbin "arch/arm64/kernel/vdso/vdso.so" |