From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753867AbbG0Ojv (ORCPT ); Mon, 27 Jul 2015 10:39:51 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:57601 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753792AbbG0Ojt (ORCPT ); Mon, 27 Jul 2015 10:39:49 -0400 Date: Mon, 27 Jul 2015 16:39:24 +0200 From: Peter Zijlstra To: Heiko Carstens Cc: linux-kernel@vger.kernel.org, mingo@kernel.org, jasonbaron0@gmail.com, bp@alien8.de, luto@amacapital.net, tglx@linutronix.de, rostedt@goodmis.org, will.deacon@arm.com, liuj97@gmail.com, rabin@rab.in, ralf@linux-mips.org, ddaney@caviumnetworks.com, benh@kernel.crashing.org, michael@ellerman.id.au, davem@davemloft.net Subject: Re: [RFC][PATCH 6/7] jump_label: Add a new static_key interface Message-ID: <20150727143924.GX19282@twins.programming.kicks-ass.net> References: <20150724175209.814173117@infradead.org> <20150724175823.120997211@infradead.org> <20150727095225.GR19282@twins.programming.kicks-ass.net> <20150727102046.GB8278@osiris> <20150727104755.GU19282@twins.programming.kicks-ass.net> <20150727105036.GO18673@twins.programming.kicks-ass.net> <20150727105242.GD8278@osiris> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150727105242.GD8278@osiris> 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 On Mon, Jul 27, 2015 at 12:52:42PM +0200, Heiko Carstens wrote: > Yeah, just did that and it crashes ;) Does this make it go? --- --- a/kernel/jump_label.c +++ b/kernel/jump_label.c @@ -221,7 +221,10 @@ void __init jump_label_init(void) for (iter = iter_start; iter < iter_stop; iter++) { struct static_key *iterk; - arch_jump_label_transform_static(iter, jump_label_type(iter)); + /* rewrite NOPs */ + if (jump_label_type(iter) == JUMP_LABEL_NOP) + arch_jump_label_transform_static(iter, JUMP_LABEL_NOP); + iterk = jump_entry_key(iter); if (iterk == key) continue;