Skip to content

Commit 453248e

Browse files
Jing LiWenlp
authored andcommitted
sw64: efi: fix compile error when CONFIG_EFI=n
Signed-off-by: Jing Li <[email protected]> Reviewed-by: He Sheng <[email protected]> Signed-off-by: Gu Zitao <[email protected]>
1 parent 762a08a commit 453248e

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

arch/sw_64/kernel/cpu.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ static int cpuinfo_cpu_online(unsigned int cpu)
7070
return 0;
7171
}
7272

73-
static const char * __init dmi_get_string(const struct dmi_header *dm, u8 s)
73+
static __maybe_unused const char * __init dmi_get_string(const struct dmi_header *dm, u8 s)
7474
{
7575
const u8 *bp = ((u8 *) dm) + dm->length;
7676
const u8 *nsp;
@@ -90,7 +90,7 @@ static const char * __init dmi_get_string(const struct dmi_header *dm, u8 s)
9090
return "";
9191
}
9292

93-
static void __init find_dmi_processor_version(const struct dmi_header *dm,
93+
static __maybe_unused void __init find_dmi_processor_version(const struct dmi_header *dm,
9494
void *private)
9595
{
9696
char *dmi_data = (char *)dm;
@@ -113,10 +113,12 @@ static void __init get_model_id(void)
113113
int i;
114114
unsigned long val;
115115

116+
#ifdef CONFIG_EFI
116117
/* Prefer model id from SMBIOS */
117118
if (!IS_ENABLED(CONFIG_SUBARCH_C3B) &&
118119
sunway_bios_version)
119120
dmi_walk(find_dmi_processor_version, NULL);
121+
#endif
120122

121123
if (strlen(model_id) > 0)
122124
return;
@@ -128,7 +130,7 @@ static void __init get_model_id(void)
128130
}
129131
}
130132

131-
static void __init find_dmi_processor_manufacturer(const struct dmi_header *dm,
133+
static __maybe_unused void __init find_dmi_processor_manufacturer(const struct dmi_header *dm,
132134
void *private)
133135
{
134136
char *dmi_data = (char *)dm;
@@ -151,10 +153,12 @@ static void __init get_vendor_id(void)
151153
int i;
152154
unsigned long val;
153155

156+
#ifdef CONFIG_EFI
154157
/* Prefer vendor id from SMBIOS */
155158
if (!IS_ENABLED(CONFIG_SUBARCH_C3B) &&
156159
sunway_bios_version)
157160
dmi_walk(find_dmi_processor_manufacturer, NULL);
161+
#endif
158162

159163
if (strlen(vendor_id) > 0)
160164
return;
@@ -166,7 +170,7 @@ static void __init get_vendor_id(void)
166170
}
167171
}
168172

169-
static void __init find_dmi_processor_family(const struct dmi_header *dm,
173+
static __maybe_unused void __init find_dmi_processor_family(const struct dmi_header *dm,
170174
void *private)
171175
{
172176
char *dmi_data = (char *)dm;
@@ -182,10 +186,12 @@ static void __init find_dmi_processor_family(const struct dmi_header *dm,
182186

183187
static void __init get_family(void)
184188
{
189+
#ifdef CONFIG_EFI
185190
/* Prefer processor family from SMBIOS */
186191
if (!IS_ENABLED(CONFIG_SUBARCH_C3B) &&
187192
sunway_bios_version)
188193
dmi_walk(find_dmi_processor_family, NULL);
194+
#endif
189195

190196
if (family)
191197
return;

0 commit comments

Comments
 (0)