projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm64: Drop workaround for broken 'S' constraint with GCC 4.9
[linux-2.6-microblaze.git]
/
arch
/
arm64
/
include
/
asm
/
kvm_asm.h
diff --git
a/arch/arm64/include/asm/kvm_asm.h
b/arch/arm64/include/asm/kvm_asm.h
index
8a33d83
..
7ccf770
100644
(file)
--- a/
arch/arm64/include/asm/kvm_asm.h
+++ b/
arch/arm64/include/asm/kvm_asm.h
@@
-199,12
+199,6
@@
extern void __vgic_v3_init_lrs(void);
extern u32 __kvm_get_mdcr_el2(void);
extern u32 __kvm_get_mdcr_el2(void);
-#if defined(GCC_VERSION) && GCC_VERSION < 50000
-#define SYM_CONSTRAINT "i"
-#else
-#define SYM_CONSTRAINT "S"
-#endif
-
/*
* Obtain the PC-relative address of a kernel symbol
* s: symbol
/*
* Obtain the PC-relative address of a kernel symbol
* s: symbol
@@
-221,7
+215,7
@@
extern u32 __kvm_get_mdcr_el2(void);
typeof(s) *addr; \
asm("adrp %0, %1\n" \
"add %0, %0, :lo12:%1\n" \
typeof(s) *addr; \
asm("adrp %0, %1\n" \
"add %0, %0, :lo12:%1\n" \
- : "=r" (addr) :
SYM_CONSTRAINT (&s));
\
+ : "=r" (addr) :
"S" (&s));
\
addr; \
})
addr; \
})