diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-22 14:12:29 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-22 14:12:29 +0800 |
| commit | 1bdc09282217939d01be67dde405880c7450c2e5 (patch) | |
| tree | 635d09d42f92fe7448bcc8cdc0660dc66999e3b2 /arch/arm | |
| parent | 5cc3b58828a8bb2ebb34de96d1aec1564f912a31 (diff) | |
| parent | f0b92cd1190816b1293c9724488ac87e0fcc38c0 (diff) | |
Merge branch 'v4.1/vdso' of https://git.linaro.org/people/david.brown/linux-lsk into linux-linaro-lsk-v4.1
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/include/asm/cacheflush.h | 1 | ||||
| -rw-r--r-- | arch/arm/vdso/vdso.S | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h index 2d46862e7bef..5797815727fe 100644 --- a/arch/arm/include/asm/cacheflush.h +++ b/arch/arm/include/asm/cacheflush.h @@ -488,7 +488,6 @@ int set_memory_x(unsigned long addr, int numpages); int set_memory_nx(unsigned long addr, int numpages); #ifdef CONFIG_DEBUG_RODATA -void mark_rodata_ro(void); void set_kernel_text_rw(void); void set_kernel_text_ro(void); #else diff --git a/arch/arm/vdso/vdso.S b/arch/arm/vdso/vdso.S index b2b97e3e7bab..a62a7b64f49c 100644 --- a/arch/arm/vdso/vdso.S +++ b/arch/arm/vdso/vdso.S @@ -23,9 +23,8 @@ #include <linux/const.h> #include <asm/page.h> - __PAGE_ALIGNED_DATA - .globl vdso_start, vdso_end + .section .data..ro_after_init .balign PAGE_SIZE vdso_start: .incbin "arch/arm/vdso/vdso.so" |