Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
arch
/
powerpc
/
kernel
/
vdso32
/
datapage.S
diff --git
a/kernel/arch/powerpc/kernel/vdso32/datapage.S
b/kernel/arch/powerpc/kernel/vdso32/datapage.S
index
dc21e89
..
59cf5f4
100644
(file)
--- a/
kernel/arch/powerpc/kernel/vdso32/datapage.S
+++ b/
kernel/arch/powerpc/kernel/vdso32/datapage.S
@@
-16,6
+16,10
@@
#include <asm/vdso.h>
.text
#include <asm/vdso.h>
.text
+ .global __kernel_datapage_offset;
+__kernel_datapage_offset:
+ .long 0
+
V_FUNCTION_BEGIN(__get_datapage)
.cfi_startproc
/* We don't want that exposed or overridable as we want other objects
V_FUNCTION_BEGIN(__get_datapage)
.cfi_startproc
/* We don't want that exposed or overridable as we want other objects
@@
-27,13
+31,11
@@
V_FUNCTION_BEGIN(__get_datapage)
mflr r0
.cfi_register lr,r0
mflr r0
.cfi_register lr,r0
- bcl 20,31,1f
- .global __kernel_datapage_offset;
-__kernel_datapage_offset:
- .long 0
-1:
+ bcl 20,31,data_page_branch
+data_page_branch:
mflr r3
mtlr r0
mflr r3
mtlr r0
+ addi r3, r3, __kernel_datapage_offset-data_page_branch
lwz r0,0(r3)
add r3,r0,r3
blr
lwz r0,0(r3)
add r3,r0,r3
blr