From: Andrew Cooper Date: Fri, 9 Feb 2018 12:54:58 +0000 (+0000) Subject: x86/alt: Drop unused alternative infrastructure X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~443 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2ad245b467278a4e36dd5e340fc673728e29520b;p=xen.git x86/alt: Drop unused alternative infrastructure ALTERNATIVE_3 is more complicated than ALTERNATIVE_2 when it comes to calculating extra padding length, and we have no need for the complexity. Signed-off-by: Andrew Cooper Reviewed-by: Wei Liu Reviewed-by: Roger Pau Monné Reviewed-by: Jan Beulich --- diff --git a/xen/include/asm-x86/alternative.h b/xen/include/asm-x86/alternative.h index ba537d6b7e..325a29fbc3 100644 --- a/xen/include/asm-x86/alternative.h +++ b/xen/include/asm-x86/alternative.h @@ -65,11 +65,6 @@ extern void alternative_instructions(void); ALTERNATIVE(oldinstr, newinstr1, feature1) \ ALTERNATIVE_N(newinstr2, feature2, 2) -#define ALTERNATIVE_3(oldinstr, newinstr1, feature1, newinstr2, feature2, \ - newinstr3, feature3) \ - ALTERNATIVE_2(oldinstr, newinstr1, feature1, newinstr2, feature2) \ - ALTERNATIVE_N(newinstr3, feature3, 3) - /* * Alternative instructions for different CPU types or capabilities. * @@ -118,23 +113,6 @@ extern void alternative_instructions(void); newinstr2, feature2) \ : output : input) -/* - * This is similar to alternative_io. But it has three features and - * respective instructions. - * - * If CPU has feature3, newinstr3 is used. - * Otherwise, if CPU has feature2, newinstr2 is used. - * Otherwise, if CPU has feature1, newinstr1 is used. - * Otherwise, oldinstr is used. - */ -#define alternative_io_3(oldinstr, newinstr1, feature1, newinstr2, \ - feature2, newinstr3, feature3, output, \ - input...) \ - asm volatile(ALTERNATIVE_3(oldinstr, newinstr1, feature1, \ - newinstr2, feature2, newinstr3, \ - feature3) \ - : output : input) - /* Use this macro(s) if you need more than one output parameter. */ #define ASM_OUTPUT2(a...) a