diff options
author | Joe Perches <joe@perches.com> | 2008-03-23 04:02:13 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:23 -0400 |
commit | eee28c251ed8ef2c6b66f0e08e9467a8cc5cf886 (patch) | |
tree | c95cf3d79cb26cf442d9029eee41148f053887dc /include/asm-x86/genapic_32.h | |
parent | 9407913fc16dde0e632b9639557422c6a792469d (diff) |
include/asm-x86/genapic_32.h: checkpatch cleanups - formatting only
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/genapic_32.h')
-rw-r--r-- | include/asm-x86/genapic_32.h | 89 |
1 files changed, 45 insertions, 44 deletions
diff --git a/include/asm-x86/genapic_32.h b/include/asm-x86/genapic_32.h index b501ae7809ba..5fa893dce729 100644 --- a/include/asm-x86/genapic_32.h +++ b/include/asm-x86/genapic_32.h | |||
@@ -18,18 +18,18 @@ struct mpc_config_bus; | |||
18 | struct mp_config_table; | 18 | struct mp_config_table; |
19 | struct mpc_config_processor; | 19 | struct mpc_config_processor; |
20 | 20 | ||
21 | struct genapic { | 21 | struct genapic { |
22 | char *name; | 22 | char *name; |
23 | int (*probe)(void); | 23 | int (*probe)(void); |
24 | 24 | ||
25 | int (*apic_id_registered)(void); | 25 | int (*apic_id_registered)(void); |
26 | cpumask_t (*target_cpus)(void); | 26 | cpumask_t (*target_cpus)(void); |
27 | int int_delivery_mode; | 27 | int int_delivery_mode; |
28 | int int_dest_mode; | 28 | int int_dest_mode; |
29 | int ESR_DISABLE; | 29 | int ESR_DISABLE; |
30 | int apic_destination_logical; | 30 | int apic_destination_logical; |
31 | unsigned long (*check_apicid_used)(physid_mask_t bitmap, int apicid); | 31 | unsigned long (*check_apicid_used)(physid_mask_t bitmap, int apicid); |
32 | unsigned long (*check_apicid_present)(int apicid); | 32 | unsigned long (*check_apicid_present)(int apicid); |
33 | int no_balance_irq; | 33 | int no_balance_irq; |
34 | int no_ioapic_check; | 34 | int no_ioapic_check; |
35 | void (*init_apic_ldr)(void); | 35 | void (*init_apic_ldr)(void); |
@@ -37,21 +37,21 @@ struct genapic { | |||
37 | 37 | ||
38 | void (*setup_apic_routing)(void); | 38 | void (*setup_apic_routing)(void); |
39 | int (*multi_timer_check)(int apic, int irq); | 39 | int (*multi_timer_check)(int apic, int irq); |
40 | int (*apicid_to_node)(int logical_apicid); | 40 | int (*apicid_to_node)(int logical_apicid); |
41 | int (*cpu_to_logical_apicid)(int cpu); | 41 | int (*cpu_to_logical_apicid)(int cpu); |
42 | int (*cpu_present_to_apicid)(int mps_cpu); | 42 | int (*cpu_present_to_apicid)(int mps_cpu); |
43 | physid_mask_t (*apicid_to_cpu_present)(int phys_apicid); | 43 | physid_mask_t (*apicid_to_cpu_present)(int phys_apicid); |
44 | void (*setup_portio_remap)(void); | 44 | void (*setup_portio_remap)(void); |
45 | int (*check_phys_apicid_present)(int boot_cpu_physical_apicid); | 45 | int (*check_phys_apicid_present)(int boot_cpu_physical_apicid); |
46 | void (*enable_apic_mode)(void); | 46 | void (*enable_apic_mode)(void); |
47 | u32 (*phys_pkg_id)(u32 cpuid_apic, int index_msb); | 47 | u32 (*phys_pkg_id)(u32 cpuid_apic, int index_msb); |
48 | 48 | ||
49 | /* mpparse */ | 49 | /* mpparse */ |
50 | /* When one of the next two hooks returns 1 the genapic | 50 | /* When one of the next two hooks returns 1 the genapic |
51 | is switched to this. Essentially they are additional probe | 51 | is switched to this. Essentially they are additional probe |
52 | functions. */ | 52 | functions. */ |
53 | int (*mps_oem_check)(struct mp_config_table *mpc, char *oem, | 53 | int (*mps_oem_check)(struct mp_config_table *mpc, char *oem, |
54 | char *productid); | 54 | char *productid); |
55 | int (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id); | 55 | int (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id); |
56 | 56 | ||
57 | unsigned (*get_apic_id)(unsigned long x); | 57 | unsigned (*get_apic_id)(unsigned long x); |
@@ -64,7 +64,7 @@ struct genapic { | |||
64 | void (*send_IPI_allbutself)(int vector); | 64 | void (*send_IPI_allbutself)(int vector); |
65 | void (*send_IPI_all)(int vector); | 65 | void (*send_IPI_all)(int vector); |
66 | #endif | 66 | #endif |
67 | }; | 67 | }; |
68 | 68 | ||
69 | #define APICFUNC(x) .x = x, | 69 | #define APICFUNC(x) .x = x, |
70 | 70 | ||
@@ -77,39 +77,40 @@ struct genapic { | |||
77 | #define IPIFUNC(x) | 77 | #define IPIFUNC(x) |
78 | #endif | 78 | #endif |
79 | 79 | ||
80 | #define APIC_INIT(aname, aprobe) { \ | 80 | #define APIC_INIT(aname, aprobe) \ |
81 | .name = aname, \ | 81 | { \ |
82 | .probe = aprobe, \ | 82 | .name = aname, \ |
83 | .int_delivery_mode = INT_DELIVERY_MODE, \ | 83 | .probe = aprobe, \ |
84 | .int_dest_mode = INT_DEST_MODE, \ | 84 | .int_delivery_mode = INT_DELIVERY_MODE, \ |
85 | .no_balance_irq = NO_BALANCE_IRQ, \ | 85 | .int_dest_mode = INT_DEST_MODE, \ |
86 | .ESR_DISABLE = esr_disable, \ | 86 | .no_balance_irq = NO_BALANCE_IRQ, \ |
87 | .apic_destination_logical = APIC_DEST_LOGICAL, \ | 87 | .ESR_DISABLE = esr_disable, \ |
88 | APICFUNC(apic_id_registered) \ | 88 | .apic_destination_logical = APIC_DEST_LOGICAL, \ |
89 | APICFUNC(target_cpus) \ | 89 | APICFUNC(apic_id_registered) \ |
90 | APICFUNC(check_apicid_used) \ | 90 | APICFUNC(target_cpus) \ |
91 | APICFUNC(check_apicid_present) \ | 91 | APICFUNC(check_apicid_used) \ |
92 | APICFUNC(init_apic_ldr) \ | 92 | APICFUNC(check_apicid_present) \ |
93 | APICFUNC(ioapic_phys_id_map) \ | 93 | APICFUNC(init_apic_ldr) \ |
94 | APICFUNC(setup_apic_routing) \ | 94 | APICFUNC(ioapic_phys_id_map) \ |
95 | APICFUNC(multi_timer_check) \ | 95 | APICFUNC(setup_apic_routing) \ |
96 | APICFUNC(apicid_to_node) \ | 96 | APICFUNC(multi_timer_check) \ |
97 | APICFUNC(cpu_to_logical_apicid) \ | 97 | APICFUNC(apicid_to_node) \ |
98 | APICFUNC(cpu_present_to_apicid) \ | 98 | APICFUNC(cpu_to_logical_apicid) \ |
99 | APICFUNC(apicid_to_cpu_present) \ | 99 | APICFUNC(cpu_present_to_apicid) \ |
100 | APICFUNC(setup_portio_remap) \ | 100 | APICFUNC(apicid_to_cpu_present) \ |
101 | APICFUNC(check_phys_apicid_present) \ | 101 | APICFUNC(setup_portio_remap) \ |
102 | APICFUNC(mps_oem_check) \ | 102 | APICFUNC(check_phys_apicid_present) \ |
103 | APICFUNC(get_apic_id) \ | 103 | APICFUNC(mps_oem_check) \ |
104 | .apic_id_mask = APIC_ID_MASK, \ | 104 | APICFUNC(get_apic_id) \ |
105 | APICFUNC(cpu_mask_to_apicid) \ | 105 | .apic_id_mask = APIC_ID_MASK, \ |
106 | APICFUNC(acpi_madt_oem_check) \ | 106 | APICFUNC(cpu_mask_to_apicid) \ |
107 | IPIFUNC(send_IPI_mask) \ | 107 | APICFUNC(acpi_madt_oem_check) \ |
108 | IPIFUNC(send_IPI_allbutself) \ | 108 | IPIFUNC(send_IPI_mask) \ |
109 | IPIFUNC(send_IPI_all) \ | 109 | IPIFUNC(send_IPI_allbutself) \ |
110 | APICFUNC(enable_apic_mode) \ | 110 | IPIFUNC(send_IPI_all) \ |
111 | APICFUNC(phys_pkg_id) \ | 111 | APICFUNC(enable_apic_mode) \ |
112 | } | 112 | APICFUNC(phys_pkg_id) \ |
113 | } | ||
113 | 114 | ||
114 | extern struct genapic *genapic; | 115 | extern struct genapic *genapic; |
115 | 116 | ||