projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
x86
/
vdso
/
vdso32.S
diff --git
a/arch/x86/vdso/vdso32.S
b/arch/x86/vdso/vdso32.S
index
1e36f72
..
2ce5f82
100644
(file)
--- a/
arch/x86/vdso/vdso32.S
+++ b/
arch/x86/vdso/vdso32.S
@@
-2,14
+2,17
@@
__INITDATA
__INITDATA
- .globl vdso32_default_start, vdso32_default_end
-vdso32_default_start:
-#ifdef CONFIG_X86_32
+ .globl vdso32_int80_start, vdso32_int80_end
+vdso32_int80_start:
.incbin "arch/x86/vdso/vdso32-int80.so"
.incbin "arch/x86/vdso/vdso32-int80.so"
-#else
+vdso32_int80_end:
+
+ .globl vdso32_syscall_start, vdso32_syscall_end
+vdso32_syscall_start:
+#ifdef CONFIG_COMPAT
.incbin "arch/x86/vdso/vdso32-syscall.so"
#endif
.incbin "arch/x86/vdso/vdso32-syscall.so"
#endif
-vdso32_
default
_end:
+vdso32_
syscall
_end:
.globl vdso32_sysenter_start, vdso32_sysenter_end
vdso32_sysenter_start:
.globl vdso32_sysenter_start, vdso32_sysenter_end
vdso32_sysenter_start: