diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2018-08-06 14:56:34 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2018-08-06 14:56:34 -0400 |
commit | 315706049c343794ad0d3e5b6f6b60b900457b11 (patch) | |
tree | 0a1596a4b5843a6262d17b4c656715854784977d /scripts | |
parent | 706d51681d636a0c4a5ef53395ec3b803e45ed4d (diff) | |
parent | c40a56a7818cfe735fc93a69e1875f8bba834483 (diff) |
Merge branch 'x86/pti-urgent' into x86/pti
Integrate the PTI Global bit fixes which conflict with the 32bit PTI
support.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/tags.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/tags.sh b/scripts/tags.sh index 412a70cce558..26de7d5aa5c8 100755 --- a/scripts/tags.sh +++ b/scripts/tags.sh | |||
@@ -152,6 +152,7 @@ regex_asm=( | |||
152 | ) | 152 | ) |
153 | regex_c=( | 153 | regex_c=( |
154 | '/^SYSCALL_DEFINE[0-9](\([[:alnum:]_]*\).*/sys_\1/' | 154 | '/^SYSCALL_DEFINE[0-9](\([[:alnum:]_]*\).*/sys_\1/' |
155 | '/^BPF_CALL_[0-9](\([[:alnum:]_]*\).*/\1/' | ||
155 | '/^COMPAT_SYSCALL_DEFINE[0-9](\([[:alnum:]_]*\).*/compat_sys_\1/' | 156 | '/^COMPAT_SYSCALL_DEFINE[0-9](\([[:alnum:]_]*\).*/compat_sys_\1/' |
156 | '/^TRACE_EVENT(\([[:alnum:]_]*\).*/trace_\1/' | 157 | '/^TRACE_EVENT(\([[:alnum:]_]*\).*/trace_\1/' |
157 | '/^TRACE_EVENT(\([[:alnum:]_]*\).*/trace_\1_rcuidle/' | 158 | '/^TRACE_EVENT(\([[:alnum:]_]*\).*/trace_\1_rcuidle/' |