summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.vnet.ibm.com>2011-10-30 15:16:06 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2011-10-30 15:16:15 +0100
commitcaa04f69df9a5d4c10867b475006cf6f2f1e8500 (patch)
tree8524411a97c08b4872c869d3440241c87a44a456
parentdd4a5a31fc06a2cda4f6a1d9de74b9009f8e31de (diff)
downloadlinux-3.10-caa04f69df9a5d4c10867b475006cf6f2f1e8500.tar.gz
linux-3.10-caa04f69df9a5d4c10867b475006cf6f2f1e8500.tar.bz2
linux-3.10-caa04f69df9a5d4c10867b475006cf6f2f1e8500.zip
[S390] topology: fix alloc_masks annotation
Fix this warning: WARNING: vmlinux.o(.text+0x199b6): Section mismatch in reference from the function alloc_masks() to the function .init.text:__alloc_bootmem() Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/kernel/topology.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index 0cd340b7263..77b8942b9a1 100644
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -299,8 +299,8 @@ out:
}
__initcall(init_topology_update);
-static void alloc_masks(struct sysinfo_15_1_x *info, struct mask_info *mask,
- int offset)
+static void __init alloc_masks(struct sysinfo_15_1_x *info,
+ struct mask_info *mask, int offset)
{
int i, nr_masks;