[Top] [All Lists]

[PATCH v2a] jump-label: initialize jump-label subsystem somewhat later

To:, Linus Torvalds <>, Andrew Morton <>,, Jeremy Fitzhardinge <>, Peter Zijlstra <>
Subject: [PATCH v2a] jump-label: initialize jump-label subsystem somewhat later
From: David Daney <>
Date: Wed, 14 Dec 2011 09:54:39 -0800
Cc:, Jason Baron <>, David Daney <>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed;; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=42+owGGElAzj3b6ROZsvinTvdrxeXzDn4gTYL8kzt7Q=; b=tB5Ak2c20eceAcV6KNmM+pp5uChbg3uDSyShiVVDrQk4pvgKDGOHplTDio5CwTE6b4 jB0AgrXB2LWwPBs+YNXaXQ1jyaOSmoW7AfkqGstjDdVeHUd4mfGdbf2zy0Zm86U+XObJ 6asitujVv38qpVjKJd2TU0UYBC8tuZF+iy6q0=
From: David Daney <>

commit 97ce2c88f9ad42e3c60a9beb9fca87abf3639faa
(jump-label: initialize jump-label subsystem much earlier) breaks MIPS.

The jump-label initialization does I-Cache flushing after modifying
code.  On MIPS this is done by calling through the function pointer
flush_icache_range().  This function pointer is initialized by

As things stand, we cannot be calling jump_label_init() until after
trap_init() completes, so we move the call down to satisfy this

Signed-off-by: David Daney <>

Sorry for spamming this out again, but Sergei keeps flagging my poor

Difference from v2: Fix grammar and spelling issues in changelog.  No
                    change to the patch.

Difference from v1: Move jump_label_init() up one so it is now before
                    mm_init() instead of after it.

 init/main.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/init/main.c b/init/main.c
index 217ed23..68ab12b 100644
--- a/init/main.c
+++ b/init/main.c
@@ -513,8 +513,6 @@ asmlinkage void __init start_kernel(void)
                   __stop___param - __start___param,
-       jump_label_init();
         * These use large bootmem allocations and must precede
         * kmem_cache_init()
@@ -524,6 +522,7 @@ asmlinkage void __init start_kernel(void)
+       jump_label_init();

<Prev in Thread] Current Thread [Next in Thread>