From 11eb9f17f6fb86ab1af3b1959fe4734e982d45ce Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Tue, 3 Jan 2012 17:35:40 +0100 Subject: [PATCH] --- yaml --- r: 277466 b: refs/heads/master c: ceb7b40b65539a771d1bfaf47660ac0ee57e0c4f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/alternative-asm.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 408362a18449..eb552ef3d80a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cdcd629869fabcd38ebd24a03b0a05ec1cbcafb0 +refs/heads/master: ceb7b40b65539a771d1bfaf47660ac0ee57e0c4f diff --git a/trunk/arch/x86/include/asm/alternative-asm.h b/trunk/arch/x86/include/asm/alternative-asm.h index 091508b533b4..952bd0100c5c 100644 --- a/trunk/arch/x86/include/asm/alternative-asm.h +++ b/trunk/arch/x86/include/asm/alternative-asm.h @@ -4,10 +4,10 @@ #ifdef CONFIG_SMP .macro LOCK_PREFIX -1: lock +672: lock .section .smp_locks,"a" .balign 4 - .long 1b - . + .long 672b - . .previous .endm #else