diff --git a/drivers/gpu/nvgpu/hal/gr/ecc/ecc_gv11b.h b/drivers/gpu/nvgpu/hal/gr/ecc/ecc_gv11b.h
index 3c868cdec..4e03e2051 100644
--- a/drivers/gpu/nvgpu/hal/gr/ecc/ecc_gv11b.h
+++ b/drivers/gpu/nvgpu/hal/gr/ecc/ecc_gv11b.h
@@ -32,6 +32,8 @@ struct nvgpu_hw_err_inject_info_desc;
 
 void gv11b_ecc_detect_enabled_units(struct gk20a *g);
 int gv11b_ecc_init(struct gk20a *g);
+
+#ifdef CONFIG_NVGPU_INJECT_HWERR
 int gv11b_gr_intr_inject_fecs_ecc_error(struct gk20a *g,
 		struct nvgpu_hw_err_inject_info *err, u32 error_info);
 struct nvgpu_hw_err_inject_info_desc *
@@ -52,5 +54,6 @@ int gv11b_gr_intr_inject_gcc_ecc_error(struct gk20a *g,
 		struct nvgpu_hw_err_inject_info *err, u32 error_info);
 struct nvgpu_hw_err_inject_info_desc *
 gv11b_gr_intr_get_gcc_err_desc(struct gk20a *g);
+#endif /* CONFIG_NVGPU_INJECT_HWERR */
 
 #endif /* NVGPU_ECC_GV11B_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gr/ctx.h b/drivers/gpu/nvgpu/include/nvgpu/gr/ctx.h
index 60eab09b7..08fcf07b6 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gr/ctx.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gr/ctx.h
@@ -179,6 +179,7 @@ void nvgpu_gr_ctx_set_tsgid(struct nvgpu_gr_ctx *gr_ctx, u32 tsgid);
 
 u32 nvgpu_gr_ctx_get_tsgid(struct nvgpu_gr_ctx *gr_ctx);
 
+#ifdef CONFIG_NVGPU_CILP
 bool nvgpu_gr_ctx_get_cilp_preempt_pending(struct nvgpu_gr_ctx *gr_ctx);
 
 void nvgpu_gr_ctx_set_cilp_preempt_pending(struct nvgpu_gr_ctx *gr_ctx,
@@ -186,6 +187,7 @@ void nvgpu_gr_ctx_set_cilp_preempt_pending(struct nvgpu_gr_ctx *gr_ctx,
 
 bool nvgpu_gr_ctx_desc_force_preemption_cilp(
 		struct nvgpu_gr_ctx_desc *gr_ctx_desc);
+#endif /* CONFIG_NVGPU_CILP */
 
 #ifdef CONFIG_NVGPU_GRAPHICS
 int nvgpu_gr_ctx_alloc_ctxsw_buffers(struct gk20a *g,