diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.9.21/0060-x86-alternatives-Add-missing-n-at-end-of-ALTERNATIVE.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.9.21/0060-x86-alternatives-Add-missing-n-at-end-of-ALTERNATIVE.patch | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.9.21/0060-x86-alternatives-Add-missing-n-at-end-of-ALTERNATIVE.patch b/common/recipes-kernel/linux/linux-yocto-4.9.21/0060-x86-alternatives-Add-missing-n-at-end-of-ALTERNATIVE.patch deleted file mode 100644 index 2fa8674a..00000000 --- a/common/recipes-kernel/linux/linux-yocto-4.9.21/0060-x86-alternatives-Add-missing-n-at-end-of-ALTERNATIVE.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 529d4e89ede9d0c39277255ec85692ce5f69cf89 Mon Sep 17 00:00:00 2001 -From: David Woodhouse <dwmw@amazon.co.uk> -Date: Thu, 4 Jan 2018 14:37:05 +0000 -Subject: [PATCH 060/103] x86/alternatives: Add missing '\n' at end of - ALTERNATIVE inline asm - -commit b9e705ef7cfaf22db0daab91ad3cd33b0fa32eb9 upstream. - -Where an ALTERNATIVE is used in the middle of an inline asm block, this -would otherwise lead to the following instruction being appended directly -to the trailing ".popsection", and a failed compile. - -Fixes: 9cebed423c84 ("x86, alternative: Use .pushsection/.popsection") -Signed-off-by: David Woodhouse <dwmw@amazon.co.uk> -Signed-off-by: Thomas Gleixner <tglx@linutronix.de> -Cc: gnomes@lxorguk.ukuu.org.uk -Cc: Rik van Riel <riel@redhat.com> -Cc: ak@linux.intel.com -Cc: Tim Chen <tim.c.chen@linux.intel.com> -Cc: Peter Zijlstra <peterz@infradead.org> -Cc: Paul Turner <pjt@google.com> -Cc: Jiri Kosina <jikos@kernel.org> -Cc: Andy Lutomirski <luto@amacapital.net> -Cc: Dave Hansen <dave.hansen@intel.com> -Cc: Kees Cook <keescook@google.com> -Cc: Linus Torvalds <torvalds@linux-foundation.org> -Cc: Greg Kroah-Hartman <gregkh@linux-foundation.org> -Cc: stable@vger.kernel.org -Link: https://lkml.kernel.org/r/20180104143710.8961-8-dwmw@amazon.co.uk -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - arch/x86/include/asm/alternative.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h -index 1b02038..10a4b2c 100644 ---- a/arch/x86/include/asm/alternative.h -+++ b/arch/x86/include/asm/alternative.h -@@ -139,7 +139,7 @@ static inline int alternatives_text_reserved(void *start, void *end) - ".popsection\n" \ - ".pushsection .altinstr_replacement, \"ax\"\n" \ - ALTINSTR_REPLACEMENT(newinstr, feature, 1) \ -- ".popsection" -+ ".popsection\n" - - #define ALTERNATIVE_2(oldinstr, newinstr1, feature1, newinstr2, feature2)\ - OLDINSTR_2(oldinstr, 1, 2) \ -@@ -150,7 +150,7 @@ static inline int alternatives_text_reserved(void *start, void *end) - ".pushsection .altinstr_replacement, \"ax\"\n" \ - ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \ - ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \ -- ".popsection" -+ ".popsection\n" - - /* - * Alternative instructions for different CPU types or capabilities. --- -2.7.4 - |