diff --git a/drivers/gpu/nvgpu/common/linux/clk_arb.c b/drivers/gpu/nvgpu/common/linux/clk_arb.c
index 950423893..82c97891f 100644
--- a/drivers/gpu/nvgpu/common/linux/clk_arb.c
+++ b/drivers/gpu/nvgpu/common/linux/clk_arb.c
@@ -423,6 +423,12 @@ mutex_fail:
 	return err;
 }
 
+void nvgpu_clk_arb_send_thermal_alarm(struct gk20a *g)
+{
+	nvgpu_clk_arb_schedule_alarm(g,
+		(0x1UL << NVGPU_GPU_EVENT_ALARM_THERMAL_ABOVE_THRESHOLD));
+}
+
 void nvgpu_clk_arb_schedule_alarm(struct gk20a *g, u32 alarm)
 {
 	struct nvgpu_clk_arb *arb = g->clk_arb;
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index 4e3eeb51f..f9f852192 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -22,8 +22,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <uapi/linux/nvgpu.h>
-
 #include <nvgpu/nvgpu_common.h>
 #include <nvgpu/timers.h>
 #include <nvgpu/kmem.h>
@@ -590,8 +588,7 @@ int nvgpu_pmu_handle_therm_event(struct nvgpu_pmu *pmu,
 	switch (msg->msg_type) {
 	case NV_PMU_THERM_MSG_ID_EVENT_HW_SLOWDOWN_NOTIFICATION:
 		if (msg->hw_slct_msg.mask == BIT(NV_PMU_THERM_EVENT_THERMAL_1))
-			nvgpu_clk_arb_schedule_alarm(gk20a_from_pmu(pmu),
-				(0x1UL << NVGPU_GPU_EVENT_ALARM_THERMAL_ABOVE_THRESHOLD));
+			nvgpu_clk_arb_send_thermal_alarm(pmu->g);
 		else
 			gk20a_dbg_pmu("Unwanted/Unregistered thermal event received %d",
 				msg->hw_slct_msg.mask);
diff --git a/drivers/gpu/nvgpu/include/nvgpu/clk_arb.h b/drivers/gpu/nvgpu/include/nvgpu/clk_arb.h
index 09f0b0d3f..c13144eec 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/clk_arb.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/clk_arb.h
@@ -77,6 +77,8 @@ int nvgpu_clk_arb_get_current_pstate(struct gk20a *g);
 
 void nvgpu_clk_arb_pstate_change_lock(struct gk20a *g, bool lock);
 
+void nvgpu_clk_arb_send_thermal_alarm(struct gk20a *g);
+
 void nvgpu_clk_arb_schedule_alarm(struct gk20a *g, u32 alarm);
 #endif /* __NVGPU_CLK_ARB_H__ */