diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-27 20:37:01 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-28 17:20:07 -0500 |
commit | 4c3e51e05a7eefead4033b187394458ff8626497 (patch) | |
tree | eaa9f0e0608974f35d00076f38ad66c46f32cf95 | |
parent | f2f05ee8b8d346d4edee766384a5fedafdd4f9f8 (diff) |
x86: clean up genapic_phys_flat
- reorder fields so that they appear in struct genapic field ordering
- add zero-initialized fields too so that it's apparent which functionality
is default / missing.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | arch/x86/kernel/genapic_flat_64.c | 75 |
1 files changed, 56 insertions, 19 deletions
diff --git a/arch/x86/kernel/genapic_flat_64.c b/arch/x86/kernel/genapic_flat_64.c index f1bfdd3608a8..e9233374cef1 100644 --- a/arch/x86/kernel/genapic_flat_64.c +++ b/arch/x86/kernel/genapic_flat_64.c | |||
@@ -320,23 +320,60 @@ physflat_cpu_mask_to_apicid_and(const struct cpumask *cpumask, | |||
320 | } | 320 | } |
321 | 321 | ||
322 | struct genapic apic_physflat = { | 322 | struct genapic apic_physflat = { |
323 | .name = "physical flat", | 323 | |
324 | .acpi_madt_oem_check = physflat_acpi_madt_oem_check, | 324 | .name = "physical flat", |
325 | .int_delivery_mode = dest_Fixed, | 325 | .probe = NULL, |
326 | .int_dest_mode = (APIC_DEST_PHYSICAL != 0), | 326 | .acpi_madt_oem_check = physflat_acpi_madt_oem_check, |
327 | .target_cpus = physflat_target_cpus, | 327 | .apic_id_registered = flat_apic_id_registered, |
328 | .vector_allocation_domain = physflat_vector_allocation_domain, | 328 | |
329 | .apic_id_registered = flat_apic_id_registered, | 329 | .int_delivery_mode = dest_Fixed, |
330 | .init_apic_ldr = flat_init_apic_ldr,/*not needed, but shouldn't hurt*/ | 330 | .int_dest_mode = (APIC_DEST_PHYSICAL != 0), |
331 | .send_IPI_all = physflat_send_IPI_all, | 331 | |
332 | .send_IPI_allbutself = physflat_send_IPI_allbutself, | 332 | .target_cpus = physflat_target_cpus, |
333 | .send_IPI_mask = physflat_send_IPI_mask, | 333 | .ESR_DISABLE = 0, |
334 | .send_IPI_mask_allbutself = physflat_send_IPI_mask_allbutself, | 334 | .apic_destination_logical = 0, |
335 | .send_IPI_self = apic_send_IPI_self, | 335 | .check_apicid_used = NULL, |
336 | .cpu_mask_to_apicid = physflat_cpu_mask_to_apicid, | 336 | .check_apicid_present = NULL, |
337 | .cpu_mask_to_apicid_and = physflat_cpu_mask_to_apicid_and, | 337 | |
338 | .phys_pkg_id = phys_pkg_id, | 338 | .no_balance_irq = 0, |
339 | .get_apic_id = get_apic_id, | 339 | .no_ioapic_check = 0, |
340 | .set_apic_id = set_apic_id, | 340 | |
341 | .apic_id_mask = (0xFFu<<24), | 341 | .vector_allocation_domain = physflat_vector_allocation_domain, |
342 | /* not needed, but shouldn't hurt: */ | ||
343 | .init_apic_ldr = flat_init_apic_ldr, | ||
344 | |||
345 | .ioapic_phys_id_map = NULL, | ||
346 | .setup_apic_routing = NULL, | ||
347 | .multi_timer_check = NULL, | ||
348 | .apicid_to_node = NULL, | ||
349 | .cpu_to_logical_apicid = NULL, | ||
350 | .cpu_present_to_apicid = NULL, | ||
351 | .apicid_to_cpu_present = NULL, | ||
352 | .setup_portio_remap = NULL, | ||
353 | .check_phys_apicid_present = NULL, | ||
354 | .enable_apic_mode = NULL, | ||
355 | .phys_pkg_id = phys_pkg_id, | ||
356 | .mps_oem_check = NULL, | ||
357 | |||
358 | .get_apic_id = get_apic_id, | ||
359 | .set_apic_id = set_apic_id, | ||
360 | .apic_id_mask = 0xFFu<<24, | ||
361 | |||
362 | .cpu_mask_to_apicid = physflat_cpu_mask_to_apicid, | ||
363 | .cpu_mask_to_apicid_and = physflat_cpu_mask_to_apicid_and, | ||
364 | |||
365 | .send_IPI_mask = physflat_send_IPI_mask, | ||
366 | .send_IPI_mask_allbutself = physflat_send_IPI_mask_allbutself, | ||
367 | .send_IPI_allbutself = physflat_send_IPI_allbutself, | ||
368 | .send_IPI_all = physflat_send_IPI_all, | ||
369 | .send_IPI_self = apic_send_IPI_self, | ||
370 | |||
371 | .wakeup_cpu = NULL, | ||
372 | .trampoline_phys_low = 0, | ||
373 | .trampoline_phys_high = 0, | ||
374 | .wait_for_init_deassert = NULL, | ||
375 | .smp_callin_clear_local_apic = NULL, | ||
376 | .store_NMI_vector = NULL, | ||
377 | .restore_NMI_vector = NULL, | ||
378 | .inquire_remote_apic = NULL, | ||
342 | }; | 379 | }; |