Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753473AbbGWO61 (ORCPT ); Thu, 23 Jul 2015 10:58:27 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:51806 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752909AbbGWO6S (ORCPT ); Thu, 23 Jul 2015 10:58:18 -0400 Date: Thu, 23 Jul 2015 16:58:01 +0200 From: Peter Zijlstra To: Jason Baron Cc: Borislav Petkov , Andy Lutomirski , Thomas Gleixner , Mikulas Patocka , Paul Mackerras , Arnaldo Carvalho de Melo , Kees Cook , Andrea Arcangeli , Vince Weaver , "hillf.zj" , Valdis Kletnieks , "linux-kernel@vger.kernel.org" , Steven Rostedt Subject: Re: Kernel broken on processors without performance counters Message-ID: <20150723145801.GI25159@twins.programming.kicks-ass.net> References: <20150721154959.GS19282@twins.programming.kicks-ass.net> <20150721161215.GU19282@twins.programming.kicks-ass.net> <20150721181553.GA3378@nazgul.tnic> <55AE9471.1000601@gmail.com> <20150722042403.GA6345@nazgul.tnic> <55AFCDA4.5010406@gmail.com> <20150723104215.GH25159@twins.programming.kicks-ass.net> <55B0F808.2060302@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <55B0F808.2060302@gmail.com> User-Agent: Mutt/1.5.21 (2012-12-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1436 Lines: 38 On Thu, Jul 23, 2015 at 10:19:52AM -0400, Jason Baron wrote: > > > > #define static_branch_likely(x) \ > > ({ \ > > bool branch; \ > > if (__builtin_types_compatible_p(typeof(x), struct static_key_true)) \ > > branch = !arch_static_branch(&(x)->key, false); \ > > else if (__builtin_types_compatible_p(typeof(x), struct static_key_false)) \ > > branch = !arch_static_branch_jump(&(x)->key, true); \ > > else \ > > branch = ____wrong_branch_error(); \ > > branch; \ > > }) > > > > #define static_branch_unlikely(x) \ > > ({ \ > > bool branch; \ > > if (__builtin_types_compatible_p(typeof(x), struct static_key_true)) \ > > branch = arch_static_branch(&(x)->key, true); \ > > else if (__builtin_types_compatible_p(typeof(x), struct static_key_false)) \ > > branch = arch_static_branch_jump(&(x)->key, false); \ > > else \ > > branch = ____wrong_branch_error(); \ > > branch; \ > > }) > > > > In 'static_branch_unlikely()', I think arch_static_branch() and > arch_static_branch_jump() are reversed. Yes, you're right. But I think I need a nap before touching this stuff again :-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/