From: Chuck Ebbert <76306.1226@compuserve.com>
To: Dave Jones <davej@redhat.com>
Cc: linux-kernel <linux-kernel@vger.kernel.org>,
Ashok Raj <ashok.raj@intel.com>, Andrew Morton <akpm@osdl.org>
Subject: Re: [patch -mm4] i386: __init should be __cpuinit
Date: Wed, 1 Feb 2006 03:03:38 -0500 [thread overview]
Message-ID: <200602010306_MC3-1-B751-57FB@compuserve.com> (raw)
In-Reply-To: <20060201053357.GA5335@redhat.com>
On Wed, 1 Feb 2006 at 00:33:57 -0500, Dave Jones wrote:
> On Tue, Jan 31, 2006 at 11:49:43PM -0500, Chuck Ebbert wrote:
> > To fix this, change every instance of __init that seems suspicious
> > into __cpuinit. When !CONFIG_HOTPLUG_CPU there is no change in .text
> > or .data size. When enabled, .text += 3248 bytes; .data += 2148 bytes.
> >
> > This should be safe in every case; the only drawback is the extra code and
> > data when CPU hotplug is enabled.
>
> How about leaving it __init on non-hotplug systems, and somehow removing
> those from cpu_devs, so get_cpu_vendor() just skips them ?
> NULL'ing those entries should be just a few bytes, instead of adding 5KB.
That's what I wanted to do but wasn't sure how. Maybe e.g. like this?
--- 2.6.16-rc1-mm4-386.orig/arch/i386/kernel/cpu/umc.c
+++ 2.6.16-rc1-mm4-386/arch/i386/kernel/cpu/umc.c
@@ -5,12 +5,12 @@
/* UMC chips appear to be only either 386 or 486, so no special init takes place.
*/
-static void __cpuinit init_umc(struct cpuinfo_x86 * c)
+static void __init init_umc(struct cpuinfo_x86 * c)
{
}
-static struct cpu_dev umc_cpu_dev __cpuinitdata = {
+static struct cpu_dev umc_cpu_dev __initdata = {
.c_vendor = "UMC",
.c_ident = { "UMC UMC UMC" },
.c_models = {
@@ -31,3 +31,11 @@ int __init umc_init_cpu(void)
}
//early_arch_initcall(umc_init_cpu);
+
+int __init umc_exit_cpu(void)
+{
+ cpu_devs[X86_VENDOR_UMC] = NULL;
+ return 0;
+}
+
+late_initcall(umc_exit_cpu);
--
Chuck
next reply other threads:[~2006-02-01 8:08 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-01 8:03 Chuck Ebbert [this message]
-- strict thread matches above, loose matches on Subject: below --
2006-02-01 4:49 [patch -mm4] i386: __init should be __cpuinit Chuck Ebbert
2006-02-01 5:33 ` Dave Jones
2006-02-01 8:05 ` Matthew Garrett
2006-02-01 16:03 ` Dave Jones
2006-02-01 18:56 ` Alan Cox
2006-02-01 19:15 ` Ashok Raj
2006-02-02 21:34 ` Pavel Machek
2006-02-02 21:39 ` Dave Jones
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=200602010306_MC3-1-B751-57FB@compuserve.com \
--to=76306.1226@compuserve.com \
--cc=akpm@osdl.org \
--cc=ashok.raj@intel.com \
--cc=davej@redhat.com \
--cc=linux-kernel@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;
as well as URLs for NNTP newsgroup(s).