The patch titled x86-64: add two __cpuinit annotations has been added to the -mm tree. Its filename is x86-64-add-two-__cpuinit-annotations.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: x86-64: add two __cpuinit annotations From: Jan Beulich <jbeulich@xxxxxxxxxx> Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86/kernel/cpu/common_64.c | 2 +- arch/x86/kernel/cpu/mcheck/mce_64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN arch/x86/kernel/cpu/common_64.c~x86-64-add-two-__cpuinit-annotations arch/x86/kernel/cpu/common_64.c --- a/arch/x86/kernel/cpu/common_64.c~x86-64-add-two-__cpuinit-annotations +++ a/arch/x86/kernel/cpu/common_64.c @@ -560,7 +560,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); diff -puN arch/x86/kernel/cpu/mcheck/mce_64.c~x86-64-add-two-__cpuinit-annotations arch/x86/kernel/cpu/mcheck/mce_64.c --- a/arch/x86/kernel/cpu/mcheck/mce_64.c~x86-64-add-two-__cpuinit-annotations +++ a/arch/x86/kernel/cpu/mcheck/mce_64.c @@ -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; _ Patches currently in -mm which might be from jbeulich@xxxxxxxxxx are linux-next.patch x86-init-annotations-in-early_printk-setup.patch x86-adjust-dependencies-for-config_x86_cmov.patch x86-pgd_cdtor-cleanup.patch x86-x86_physvirt_bits-field-also-for-i386.patch x86-adjust-vmalloc_sync_all-for-xen-2nd-try.patch x86-fix-ticket-spin-lock-asm-constraints.patch x86-64-reduce-boot-fixmap-space.patch x86-64-add-two-__cpuinit-annotations.patch x86-64-eliminate-dead-code.patch x86-64-slightly-streamline-32-bit-syscall-entry-code.patch adjust-init-section-definitions.patch kconfig-eliminate-def_bool-n-constructs.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html