diff --git a/arch/arm64/kvm/sys_regs.h b/arch/arm64/kvm/sys_regs.h
index 0f95964339b164518944d93bb062e2c0519ff28e..5f3d92b2568dc6e1ec85c917b93f74a23b6fdfef 100644
--- a/arch/arm64/kvm/sys_regs.h
+++ b/arch/arm64/kvm/sys_regs.h
@@ -63,8 +63,13 @@ struct sys_reg_desc {
 #define REG_RAZ			(1 << 1) /* RAZ from userspace and guest */
 
 static __printf(2, 3)
+#if defined(CONFIG_OPTIMIZE_INLINING)
 inline void print_sys_reg_msg(const struct sys_reg_params *p,
 				       char *fmt, ...)
+#else
+void print_sys_reg_msg(const struct sys_reg_params *p,
+				       char *fmt, ...)
+#endif
 {
 	va_list va;
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
index 0e64c39a23722ac82572649a2a63d907ebe75ce6..a0b2e4f2d43f0241d2ee6bda001c82c88f87e8f5 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
@@ -168,8 +168,13 @@ static uint32_t  __calc_hdr_byte_sum(struct amdgpu_ras_eeprom_control *control)
 	return tbl_sum;
 }
 
+#if defined(CONFIG_OPTIMIZE_INLINING)
+static inline uint32_t  __calc_recs_byte_sum(struct eeprom_table_record *records,
+				      int num)
+#else
 static uint32_t  __calc_recs_byte_sum(struct eeprom_table_record *records,
 				      int num)
+#endif
 {
 	int i, j;
 	uint32_t tbl_sum = 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h
index c7a5e5c7c61ebb0656000a2eb51f4aa9793b8d75..d02019a2cbbb717214e44d0cfc48a27c3f064d88 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h
@@ -88,8 +88,11 @@ int amdgpu_ras_eeprom_process_recods(struct amdgpu_ras_eeprom_control *control,
 					    struct eeprom_table_record *records,
 					    bool write,
 					    int num);
-
+#if defined(CONFIG_OPTIMIZE_INLINING)
 inline uint32_t amdgpu_ras_eeprom_get_record_max_length(void);
+#else
+uint32_t amdgpu_ras_eeprom_get_record_max_length(void);
+#endif
 
 void amdgpu_ras_eeprom_test(struct amdgpu_ras_eeprom_control *control);
 
diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_include/print_support.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/print_support.h
index 540b405cc0f7625d532e532883143449a6ea155a..6518eee7af833946a6fd81e8a5a28d0ed098d4a5 100644
--- a/drivers/staging/media/atomisp/pci/hive_isp_css_include/print_support.h
+++ b/drivers/staging/media/atomisp/pci/hive_isp_css_include/print_support.h
@@ -20,7 +20,11 @@
 
 extern int (*sh_css_printf)(const char *fmt, va_list args);
 /* depends on host supplied print function in ia_css_init() */
+#if defined(CONFIG_OPTIMIZE_INLINING)
 static inline  __printf(1, 2) void ia_css_print(const char *fmt, ...)
+#else
+static __printf(1, 2) void ia_css_print(const char *fmt, ...)
+#endif
 {
 	va_list ap;
 
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index ebd46c8d5fb82839f6c7ddee056e279af847bca5..a1a835c5d6cc86fab542dc4c0aa9eccee1d1708c 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -334,7 +334,7 @@ config HEADERS_INSTALL
 	  as uapi header sanity checks.
 
 config OPTIMIZE_INLINING
-	def_bool y
+	def_bool n
 	help
 	  This option determines if the kernel forces gcc to inline the functions
 	  developers have marked 'inline'. Doing so takes away freedom from gcc to