diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h
index 16e59de1fc87a0c62eee02d1e64051790c871593..c4c5c44fdea5e6a39542f6c5d1fc9f42b44a793e 100644
--- a/include/clocksource/arm_arch_timer.h
+++ b/include/clocksource/arm_arch_timer.h
@@ -8,6 +8,7 @@
 #include <linux/bitops.h>
 #include <linux/timecounter.h>
 #include <linux/types.h>
+#include <linux/bug.h>
 
 #define ARCH_TIMER_TYPE_CP15		BIT(0)
 #define ARCH_TIMER_TYPE_MEM		BIT(1)
@@ -115,10 +116,29 @@ static inline bool vtimer_irqbypass_hw_support(struct arch_timer_kvm_info *info)
 	return info->irqbypass_flag & VT_EXPANDDEV_PROBED;
 }
 
+#ifdef CONFIG_HISILICON_IRQ_MBIGEN
+
 void vtimer_mbigen_set_vector(int cpu_id, u16 vpeid);
 bool vtimer_mbigen_get_active(int cpu_id);
 void vtimer_mbigen_set_auto_clr(int cpu_id, bool set);
 void vtimer_gic_set_auto_clr(int cpu_id, bool set);
 void vtimer_mbigen_set_active(int cpu_id, bool set);
 
+#else
+
+static inline void vtimer_mbigen_set_vector(int cpu_id, u16 vpeid) {}
+
+static inline bool vtimer_mbigen_get_active(int cpu_id)
+{
+	/* You really shouldn't get here.. */
+	WARN_ON_ONCE(1);
+	return false;
+}
+
+static inline void vtimer_mbigen_set_auto_clr(int cpu_id, bool set) {}
+static inline void vtimer_gic_set_auto_clr(int cpu_id, bool set) {}
+static inline void vtimer_mbigen_set_active(int cpu_id, bool set) {}
+
+#endif
+
 #endif