From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x225ZRBMvw5AxgmF2iC4U3ORqv9RwMPhcxX6ejy0mK0BiIbunA+g9GVibndR4f79gKUQXD5Io ARC-Seal: i=1; a=rsa-sha256; t=1516721589; cv=none; d=google.com; s=arc-20160816; b=M65eyhGIw1ImMTHmLIZqoWu6nQEO3QHNlGW5WspNE9pIU7IBTFqSPxvlOx8P2NaVYt L33ZEzHYYYUmfqibxD+9Ry7OGkNxZaI9m0C2hYdO6pRs/MhUstIfSfjztYoQ/q2w/2dW CyjkOFx7iRihHmkVOXu1CSFeM+gNnH/m4/qMFt9VyWRb9O/lMjLqc1thtP/I/RbADRPf LXhOp3gYYs0+qaQeSMRPPdgZqKzI+SI3MPFzZNjYo0ECVvtbYEFFeGVCj24Dl33XDlX4 KWFtFKy0gGf5/MtuvIMw8D2gz9jsOL3AOkcu8yFl9tbVjMLpTep6Gs7SxyKuBjMXq6K/ /63Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-disposition:mime-version:references:subject:cc:to:from:date :user-agent:message-id:dkim-signature:arc-authentication-results; bh=8zPPNmm6LRKjfLohVNsFRrNbLd2LRCND2RquiNqWkr8=; b=VKCnD2hPwhYcH2B0w2Du/KuVCUKfxEd1igtfMwsvXs3LvzrGNKJP4G91qOEO1PS69w LHIRoEbLLfSCwVUAb2CIqPhNl8b5wRW+BEJ/9bVPxPI8RSvYC1VMMsobkmOcXX/4M5dc 193JChjtDuhJZSoNTCW/8tqASxxyid5ca/lu2BcVKW4ctGNPNIJyL3Bn8Xd9tCldnrVn TOpqgNMEBelmDA8hoE6eSjHdF5oyP8G2fsXmjFtOniIelhYpZmw3w7flBrwNxFUQBVx8 OsoC5WSGdjysQQJP6EoPd+AehzLZzUvvEAdlyoVoMZ3Qv3/CZViqWD41CUAGfaGxUUhc znYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=merlin.20170209 header.b=LWojUdcw; spf=pass (google.com: best guess record for domain of peterz@infradead.org designates 205.233.59.134 as permitted sender) smtp.mailfrom=peterz@infradead.org Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=merlin.20170209 header.b=LWojUdcw; spf=pass (google.com: best guess record for domain of peterz@infradead.org designates 205.233.59.134 as permitted sender) smtp.mailfrom=peterz@infradead.org Message-Id: <20180123152638.700221673@infradead.org> User-Agent: quilt/0.63-1 Date: Tue, 23 Jan 2018 16:25:51 +0100 From: Peter Zijlstra To: David Woodhouse , Thomas Gleixner , Josh Poimboeuf Cc: linux-kernel@vger.kernel.org, Dave Hansen , Ashok Raj , Tim Chen , Andy Lutomirski , Linus Torvalds , Greg KH , Andrea Arcangeli , Andi Kleen , Arjan Van De Ven , Dan Williams , Paolo Bonzini , Jun Nakajima , Asit Mallick , Jason Baron , Peter Zijlstra Subject: [PATCH 12/24] x86: Update _static_cpu_has to use all named variables References: <20180123152539.374360046@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline; filename=peterz-fix-static_cpu_has_names.patch X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590397857451078097?= X-GMAIL-MSGID: =?utf-8?q?1590397857451078097?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Requested-by: Josh Poimboeuf Signed-off-by: Peter Zijlstra (Intel) --- arch/x86/include/asm/cpufeature.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h @@ -153,7 +153,7 @@ static __always_inline __pure bool _stat ".section .altinstructions,\"a\"\n" " .long 1b - .\n" /* src offset */ " .long 4f - .\n" /* repl offset */ - " .word %P1\n" /* always replace */ + " .word %P[always]\n" /* always replace */ " .byte 3b - 1b\n" /* src len */ " .byte 5f - 4f\n" /* repl len */ " .byte 3b - 2b\n" /* pad len */ @@ -165,7 +165,7 @@ static __always_inline __pure bool _stat ".section .altinstructions,\"a\"\n" " .long 1b - .\n" /* src offset */ " .long 0\n" /* no replacement */ - " .word %P0\n" /* feature bit */ + " .word %P[feature]\n" /* feature bit */ " .byte 3b - 1b\n" /* src len */ " .byte 0\n" /* repl len */ " .byte 0\n" /* pad len */ @@ -176,8 +176,9 @@ static __always_inline __pure bool _stat " jnz %l[t_yes]\n" " jmp %l[t_no]\n" ".previous\n" - : : "i" (bit), "i" (X86_FEATURE_ALWAYS), - [bitnum] "i" (1 << (bit & 7)), + : : [feature] "i" (bit), + [always] "i" (X86_FEATURE_ALWAYS), + [bitnum] "i" (1 << (bit & 7)), [cap_byte] "m" (((const char *)boot_cpu_data.x86_capability)[bit >> 3]) : : t_yes, t_no); t_yes: