diff --git a/[refs] b/[refs]
index 8f6d4cb15422..9b00d40bcc05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd4a5a31fc06a2cda4f6a1d9de74b9009f8e31de
+refs/heads/master: caa04f69df9a5d4c10867b475006cf6f2f1e8500
diff --git a/trunk/arch/s390/kernel/topology.c b/trunk/arch/s390/kernel/topology.c
index 0cd340b72632..77b8942b9a15 100644
--- a/trunk/arch/s390/kernel/topology.c
+++ b/trunk/arch/s390/kernel/topology.c
@@ -299,8 +299,8 @@ static int __init init_topology_update(void)
 }
 __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;