18
18
#include <linux/nodemask.h>
19
19
#include <linux/topology.h>
20
20
#include <linux/numa_memblks.h>
21
+ #include <linux/string_choices.h>
21
22
22
23
static nodemask_t nodes_found_map = NODE_MASK_NONE ;
23
24
@@ -188,8 +189,7 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
188
189
pr_debug ("SRAT Processor (id[0x%02x] eid[0x%02x]) in proximity domain %d %s\n" ,
189
190
p -> apic_id , p -> local_sapic_eid ,
190
191
p -> proximity_domain_lo ,
191
- (p -> flags & ACPI_SRAT_CPU_ENABLED ) ?
192
- "enabled" : "disabled" );
192
+ str_enabled_disabled (p -> flags & ACPI_SRAT_CPU_ENABLED ));
193
193
}
194
194
break ;
195
195
@@ -201,8 +201,7 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
201
201
(unsigned long long )p -> base_address ,
202
202
(unsigned long long )p -> length ,
203
203
p -> proximity_domain ,
204
- (p -> flags & ACPI_SRAT_MEM_ENABLED ) ?
205
- "enabled" : "disabled" ,
204
+ str_enabled_disabled (p -> flags & ACPI_SRAT_MEM_ENABLED ),
206
205
(p -> flags & ACPI_SRAT_MEM_HOT_PLUGGABLE ) ?
207
206
" hot-pluggable" : "" ,
208
207
(p -> flags & ACPI_SRAT_MEM_NON_VOLATILE ) ?
@@ -217,8 +216,7 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
217
216
pr_debug ("SRAT Processor (x2apicid[0x%08x]) in proximity domain %d %s\n" ,
218
217
p -> apic_id ,
219
218
p -> proximity_domain ,
220
- (p -> flags & ACPI_SRAT_CPU_ENABLED ) ?
221
- "enabled" : "disabled" );
219
+ str_enabled_disabled (p -> flags & ACPI_SRAT_CPU_ENABLED ));
222
220
}
223
221
break ;
224
222
@@ -229,8 +227,7 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
229
227
pr_debug ("SRAT Processor (acpi id[0x%04x]) in proximity domain %d %s\n" ,
230
228
p -> acpi_processor_uid ,
231
229
p -> proximity_domain ,
232
- (p -> flags & ACPI_SRAT_GICC_ENABLED ) ?
233
- "enabled" : "disabled" );
230
+ str_enabled_disabled (p -> flags & ACPI_SRAT_GICC_ENABLED ));
234
231
}
235
232
break ;
236
233
@@ -248,8 +245,7 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
248
245
* (u16 * )(& p -> device_handle [0 ]),
249
246
* (u16 * )(& p -> device_handle [2 ]),
250
247
p -> proximity_domain ,
251
- (p -> flags & ACPI_SRAT_GENERIC_AFFINITY_ENABLED ) ?
252
- "enabled" : "disabled" );
248
+ str_enabled_disabled (p -> flags & ACPI_SRAT_GENERIC_AFFINITY_ENABLED ));
253
249
} else {
254
250
/*
255
251
* In this case we can rely on the device having a
@@ -259,8 +255,7 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
259
255
(char * )(& p -> device_handle [0 ]),
260
256
(char * )(& p -> device_handle [8 ]),
261
257
p -> proximity_domain ,
262
- (p -> flags & ACPI_SRAT_GENERIC_AFFINITY_ENABLED ) ?
263
- "enabled" : "disabled" );
258
+ str_enabled_disabled (p -> flags & ACPI_SRAT_GENERIC_AFFINITY_ENABLED ));
264
259
}
265
260
}
266
261
break ;
@@ -272,8 +267,7 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
272
267
pr_debug ("SRAT Processor (acpi id[0x%04x]) in proximity domain %d %s\n" ,
273
268
p -> acpi_processor_uid ,
274
269
p -> proximity_domain ,
275
- (p -> flags & ACPI_SRAT_RINTC_ENABLED ) ?
276
- "enabled" : "disabled" );
270
+ str_enabled_disabled (p -> flags & ACPI_SRAT_RINTC_ENABLED ));
277
271
}
278
272
break ;
279
273
0 commit comments