* [PATCH] x86-64: add two __cpuinit annotations
@ 2008-08-29 12:15 Jan Beulich
2008-09-06 17:51 ` Ingo Molnar
0 siblings, 1 reply; 2+ messages in thread
From: Jan Beulich @ 2008-08-29 12:15 UTC (permalink / raw)
To: mingo, tglx, hpa; +Cc: linux-kernel
Signed-off-by: Jan Beulich <jbeulich@novell.com>
---
arch/x86/kernel/cpu/common_64.c | 2 +-
arch/x86/kernel/cpu/mcheck/mce_64.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- linux-2.6.27-rc5/arch/x86/kernel/cpu/common_64.c 2008-08-29 10:53:00.000000000 +0200
+++ 2.6.27-rc5-x86_64-cpuinit/arch/x86/kernel/cpu/common_64.c 2008-08-22 15:24:33.000000000 +0200
@@ -470,7 +470,7 @@ static int __init nonx32_setup(char *str
}
__setup("noexec32=", nonx32_setup);
-void pda_init(int cpu)
+void __cpuinit pda_init(int cpu)
{
struct x8664_pda *pda = cpu_pda(cpu);
--- linux-2.6.27-rc5/arch/x86/kernel/cpu/mcheck/mce_64.c 2008-08-29 10:53:00.000000000 +0200
+++ 2.6.27-rc5-x86_64-cpuinit/arch/x86/kernel/cpu/mcheck/mce_64.c 2008-08-22 15:24:33.000000000 +0200
@@ -860,7 +860,7 @@ error:
return err;
}
-static void mce_remove_device(unsigned int cpu)
+static __cpuinit void mce_remove_device(unsigned int cpu)
{
int i;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] x86-64: add two __cpuinit annotations
2008-08-29 12:15 [PATCH] x86-64: add two __cpuinit annotations Jan Beulich
@ 2008-09-06 17:51 ` Ingo Molnar
0 siblings, 0 replies; 2+ messages in thread
From: Ingo Molnar @ 2008-09-06 17:51 UTC (permalink / raw)
To: Jan Beulich; +Cc: tglx, hpa, linux-kernel
* Jan Beulich <jbeulich@novell.com> wrote:
> Signed-off-by: Jan Beulich <jbeulich@novell.com>
>
> ---
> arch/x86/kernel/cpu/common_64.c | 2 +-
> arch/x86/kernel/cpu/mcheck/mce_64.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
merged up to and applied to tip/x86/unify-cpu-detect. Thanks,
Ingo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-09-06 17:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-29 12:15 [PATCH] x86-64: add two __cpuinit annotations Jan Beulich
2008-09-06 17:51 ` Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox