summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-07-05 06:41:31 +0200
committerKees Cook <keescook@chromium.org>2017-07-05 06:41:31 +0200
commitd1185a8c5dd21182012e6dd531b00fd72f4d30cb (patch)
tree1c394d6e27bad00e0f3aba4e59ca19823d0486d5 /arch/arm/include/asm
parentLinux 4.12 (diff)
parentMerge branch 'for-next/gcc-plugin-infrastructure' into merge/randstruct (diff)
downloadlinux-d1185a8c5dd21182012e6dd531b00fd72f4d30cb.tar.xz
linux-d1185a8c5dd21182012e6dd531b00fd72f4d30cb.zip
Merge branch 'merge/randstruct' into for-next/gcc-plugins
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r--arch/arm/include/asm/assembler.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
index 68b06f9c65de..ad301f107dd2 100644
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
@@ -87,6 +87,8 @@
#define CALGN(code...)
#endif
+#define IMM12_MASK 0xfff
+
/*
* Enable and disable interrupts
*/