From: Satyam Sharma <satyam@infradead.org>

cpuid_class_cpu_callback() is callback function of a CPU hotplug
notifier_block (that is already marked as __cpuinitdata).  Therefore it can
safely be marked as __cpuinit.

cpuid_device_create() is only referenced from other functions that are
__cpuinit or __init.  So it can also be safely marked __cpuinit.

Signed-off-by: Satyam Sharma <satyam@infradead.org>
Cc: Andi Kleen <ak@suse.de>
Acked-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/i386/kernel/cpuid.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN arch/i386/kernel/cpuid.c~i386-cpuid-misc-cpuinit-annotations arch/i386/kernel/cpuid.c
--- a/arch/i386/kernel/cpuid.c~i386-cpuid-misc-cpuinit-annotations
+++ a/arch/i386/kernel/cpuid.c
@@ -136,7 +136,7 @@ static const struct file_operations cpui
 	.open = cpuid_open,
 };
 
-static int cpuid_device_create(int cpu)
+static int __cpuinit cpuid_device_create(int cpu)
 {
 	struct device *dev;
 
_