From fad140c2c8468d10ff44ec5baedd133ad6e205b9 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 27 Nov 2009 15:04:58 +0000 Subject: [PATCH] --- yaml --- r: 169965 b: refs/heads/master c: 01be50a308be466e122c3a8b3d535f1b673ecbd2 h: refs/heads/master i: 169963: 10a3066c0af876e805f70dfc137c429a04c55ddb v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/alternative.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1b3639f15dd2..19da1a7f33fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ec6993d9f7d961014af970ded57542961fe9ad9 +refs/heads/master: 01be50a308be466e122c3a8b3d535f1b673ecbd2 diff --git a/trunk/arch/x86/include/asm/alternative.h b/trunk/arch/x86/include/asm/alternative.h index c240efc74e00..69b74a7b877f 100644 --- a/trunk/arch/x86/include/asm/alternative.h +++ b/trunk/arch/x86/include/asm/alternative.h @@ -84,6 +84,7 @@ static inline void alternatives_smp_switch(int smp) {} " .byte " __stringify(feature) "\n" /* feature bit */ \ " .byte 662b-661b\n" /* sourcelen */ \ " .byte 664f-663f\n" /* replacementlen */ \ + " .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */ \ ".previous\n" \ ".section .altinstr_replacement, \"ax\"\n" \ "663:\n\t" newinstr "\n664:\n" /* replacement */ \