diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-09 15:56:07 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-09 15:56:07 -0400 |
| commit | 31f9f214356fbf964879f4f927aebecacde7adf2 (patch) | |
| tree | 868aaec1fd8b98e4e61715f6eeaf1878a1ebdc25 | |
| parent | c697950127e0b37d16f8d40ef85542670d384c4c (diff) | |
| download | longterm-queue-4.18-31f9f214356fbf964879f4f927aebecacde7adf2.tar.gz | |
compiler: drop 4.19+ asm-goto patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/include-linux-compiler-.h-define-asm_volatile_goto.patch | 34 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 35 deletions
diff --git a/queue/include-linux-compiler-.h-define-asm_volatile_goto.patch b/queue/include-linux-compiler-.h-define-asm_volatile_goto.patch deleted file mode 100644 index 0d52a82..0000000 --- a/queue/include-linux-compiler-.h-define-asm_volatile_goto.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8bd66d147c88bd441178c7b4c774ae5a185f19b8 Mon Sep 17 00:00:00 2001 -From: "ndesaulniers@google.com" <ndesaulniers@google.com> -Date: Wed, 31 Oct 2018 12:39:01 -0700 -Subject: [PATCH] include/linux/compiler*.h: define asm_volatile_goto - -commit 8bd66d147c88bd441178c7b4c774ae5a185f19b8 upstream. - -asm_volatile_goto should also be defined for other compilers that support -asm goto. - -Fixes commit 815f0ddb346c ("include/linux/compiler*.h: make compiler-*.h -mutually exclusive"). - -Signed-off-by: Nick Desaulniers <ndesaulniers@google.com> -Signed-off-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> - -diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h -index 3439d7d0249a..4a3f9c09c92d 100644 ---- a/include/linux/compiler_types.h -+++ b/include/linux/compiler_types.h -@@ -130,6 +130,10 @@ struct ftrace_likely_data { - # define randomized_struct_fields_end - #endif - -+#ifndef asm_volatile_goto -+#define asm_volatile_goto(x...) asm goto(x) -+#endif -+ - /* Are two types/vars the same type (ignoring qualifiers)? */ - #define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b)) - --- -2.9.5 - diff --git a/queue/series b/queue/series index 09c4d83..4478aa1 100644 --- a/queue/series +++ b/queue/series @@ -20,7 +20,6 @@ net-mlx5e-Disable-rxhash-when-CQE-compress-is-enable.patch bnxt_en-Fix-aggregation-buffer-leak-under-OOM-condit.patch net-tls-don-t-ignore-netdev-notifications-if-no-TLS-.patch crypto-vmx-ghash-do-nosimd-fallback-manually.patch -include-linux-compiler-.h-define-asm_volatile_goto.patch compiler.h-give-up-__compiletime_assert_fallback.patch jump_label-move-asm-goto-support-test-to-Kconfig.patch xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch |