Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[firefly-linux-kernel-4.4.55.git] / arch / s390 / include / asm / topology.h

diff --git a/arch/s390/include/asm/topology.h b/arch/s390/include/asm/topology.h
index 7016dd7b6bc421c8f94bbe369c86d9227def458e..0837de80c351d58ac2680554b576a46c1d445347 100644 (file)
--- a/arch/s390/include/asm/topology.h
+++ b/arch/s390/include/asm/topology.h
@@ -35,11 +35,13 @@ int topology_cpu_init(struct cpu *);
 int topology_set_cpu_management(int fc);
 void topology_schedule_update(void);
 void store_topology(struct sysinfo_15_1_x *info);
+void topology_expect_change(void);
 
 #else /* CONFIG_SCHED_BOOK */
 
 static inline void topology_schedule_update(void) { }
 static inline int topology_cpu_init(struct cpu *cpu) { return 0; }
+static inline void topology_expect_change(void) { }
 
 #endif /* CONFIG_SCHED_BOOK */