From: David Miller <davem@davemloft.net>
To: sam@ravnborg.org
Cc: peterz@infradead.org, linux-kernel@vger.kernel.org,
sparclinux@vger.kernel.org
Subject: Re: sparc boot failure due to perf init
Date: Sun, 09 Jan 2011 15:37:45 -0800 (PST) [thread overview]
Message-ID: <20110109.153745.35032992.davem@davemloft.net> (raw)
In-Reply-To: <20110107203119.GA30408@merkur.ravnborg.org>
From: Sam Ravnborg <sam@ravnborg.org>
Date: Fri, 7 Jan 2011 21:31:19 +0100
> Then you guys can sort it out and I can test any patches
> you come up with.
Here is the fix I will be pushing to Linus to fix this:
--------------------
sparc64: Fix bootup regression due to perf init ordering.
Commit 004417a6d468e24399e383645c068b498eed84ad
("perf, arch: Cleanup perf-pmu init vs lockup-detector")
move the perf events init to be an early_initcall.
But this won't work properly unless the dependencies for
this code initialize beforehand.
Fix it by making cpu_type_probe and pcr_arch_init be
an early_initcall as well.
Reported-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
arch/sparc/kernel/cpu.c | 2 +-
arch/sparc/kernel/pcr.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/sparc/kernel/cpu.c b/arch/sparc/kernel/cpu.c
index e447938..0dc714f 100644
--- a/arch/sparc/kernel/cpu.c
+++ b/arch/sparc/kernel/cpu.c
@@ -375,5 +375,5 @@ static int __init cpu_type_probe(void)
return 0;
}
-arch_initcall(cpu_type_probe);
+early_initcall(cpu_type_probe);
#endif
diff --git a/arch/sparc/kernel/pcr.c b/arch/sparc/kernel/pcr.c
index b87873c..ae96cf5 100644
--- a/arch/sparc/kernel/pcr.c
+++ b/arch/sparc/kernel/pcr.c
@@ -168,4 +168,4 @@ out_unregister:
return err;
}
-arch_initcall(pcr_arch_init);
+early_initcall(pcr_arch_init);
--
1.7.3.4
next prev parent reply other threads:[~2011-01-09 23:37 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-07 20:18 sparc boot failure due to perf init Sam Ravnborg
2011-01-07 20:22 ` Sam Ravnborg
2011-01-07 20:23 ` Peter Zijlstra
2011-01-07 20:27 ` Peter Zijlstra
2011-01-07 20:31 ` Sam Ravnborg
2011-01-09 23:37 ` David Miller [this message]
2011-01-10 15:21 ` Peter Zijlstra
2011-01-13 10:55 ` Peter Zijlstra
2011-01-13 12:25 ` Sam Ravnborg
2011-01-13 12:33 ` Peter Zijlstra
2011-01-13 20:25 ` David Miller
2011-01-08 2:23 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110109.153745.35032992.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=sam@ravnborg.org \
--cc=sparclinux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox