4 files changed, 14 insertions, 0 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 955ad4089a7a..7b2c8db45d8a 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2129,4 +2129,7 @@ source "lib/Kconfig"
 config ARCH_HAS_FEATHER_TRACE
         def_bool y
 
+config ARCH_HAS_SEND_PULL_TIMERS
+        def_bool y
+
 source "litmus/Kconfig"
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index b34823755ee4..370096d132d1 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -184,6 +184,8 @@ struct hrtimer_cpu_base {
         struct list_head                to_pull;
 };
 
+#ifdef CONFIG_ARCH_HAS_SEND_PULL_TIMERS
+
 #define HRTIMER_START_ON_INACTIVE       0
 #define HRTIMER_START_ON_QUEUED         1
 
@@ -203,6 +205,8 @@ struct hrtimer_start_on_info {
         atomic_t                state;
 };
 
+#endif
+
 static inline void hrtimer_set_expires(struct hrtimer *timer, ktime_t time)
 {
         timer->_expires = time;
@@ -369,9 +373,11 @@ __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
                          unsigned long delta_ns,
                          const enum hrtimer_mode mode, int wakeup);
 
+#ifdef CONFIG_ARCH_HAS_SEND_PULL_TIMERS
 extern int hrtimer_start_on(int cpu, struct hrtimer_start_on_info *info,
                         struct hrtimer *timer, ktime_t time,
                         const enum hrtimer_mode mode);
+#endif
 
 extern int hrtimer_cancel(struct hrtimer *timer);
 extern int hrtimer_try_to_cancel(struct hrtimer *timer);
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index 02e5097bf319..18314ae830ee 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1043,6 +1043,8 @@ hrtimer_start(struct hrtimer *timer, ktime_t tim, const enum hrtimer_mode mode)
 }
 EXPORT_SYMBOL_GPL(hrtimer_start);
 
+#ifdef CONFIG_ARCH_HAS_SEND_PULL_TIMERS
+
 /**
  *  hrtimer_pull - PULL_TIMERS_VECTOR callback on remote cpu
  */
@@ -1123,6 +1125,8 @@ int hrtimer_start_on(int cpu, struct hrtimer_start_on_info* info,
         return in_use;
 }
 
+#endif
+
 /**
  * hrtimer_try_to_cancel - try to deactivate a timer
  * @timer:      hrtimer to stop
diff --git a/litmus/Kconfig b/litmus/Kconfig
index 614e1051fa49..ba2e2d901888 100644
--- a/litmus/Kconfig
+++ b/litmus/Kconfig
@@ -13,6 +13,7 @@ config PLUGIN_CEDF
 
 config RELEASE_MASTER
         bool "Release-master Support"
+        depends on ARCH_HAS_SEND_PULL_TIMERS
         default n
         help
            Allow one processor to act as a dedicated interrupt processor