File tree Expand file tree Collapse file tree 1 file changed +3
-6
lines changed Expand file tree Collapse file tree 1 file changed +3
-6
lines changed Original file line number Diff line number Diff line change @@ -896,7 +896,6 @@ const void * __init of_flat_dt_match_machine(const void *default_match,
896
896
return best_data ;
897
897
}
898
898
899
- #ifdef CONFIG_BLK_DEV_INITRD
900
899
static void __early_init_dt_declare_initrd (unsigned long start ,
901
900
unsigned long end )
902
901
{
@@ -922,6 +921,9 @@ static void __init early_init_dt_check_for_initrd(unsigned long node)
922
921
int len ;
923
922
const __be32 * prop ;
924
923
924
+ if (!IS_ENABLED (CONFIG_BLK_DEV_INITRD ))
925
+ return ;
926
+
925
927
pr_debug ("Looking for initrd properties... " );
926
928
927
929
prop = of_get_flat_dt_prop (node , "linux,initrd-start" , & len );
@@ -940,11 +942,6 @@ static void __init early_init_dt_check_for_initrd(unsigned long node)
940
942
941
943
pr_debug ("initrd_start=0x%llx initrd_end=0x%llx\n" , start , end );
942
944
}
943
- #else
944
- static inline void early_init_dt_check_for_initrd (unsigned long node )
945
- {
946
- }
947
- #endif /* CONFIG_BLK_DEV_INITRD */
948
945
949
946
/**
950
947
* early_init_dt_check_for_elfcorehdr - Decode elfcorehdr location from flat
You can’t perform that action at this time.
0 commit comments