projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'fixes', 'misc' and 'spectre' into for-linus
[linux-block.git]
/
arch
/
arm
/
include
/
asm
/
assembler.h
diff --git
a/arch/arm/include/asm/assembler.h
b/arch/arm/include/asm/assembler.h
index f0515f60cff51f11cceb937c10986788649ab446..b17ee03d280b6ff9ff706f04ab4d3be57f20bfe8 100644
(file)
--- a/
arch/arm/include/asm/assembler.h
+++ b/
arch/arm/include/asm/assembler.h
@@
-548,4
+548,14
@@
THUMB( orr \reg , \reg , #PSR_T_BIT )
#endif
.endm
+#ifdef CONFIG_KPROBES
+#define _ASM_NOKPROBE(entry) \
+ .pushsection "_kprobe_blacklist", "aw" ; \
+ .balign 4 ; \
+ .long entry; \
+ .popsection
+#else
+#define _ASM_NOKPROBE(entry)
+#endif
+
#endif /* __ASM_ASSEMBLER_H__ */