提交 eee28c25 编写于 作者: J Joe Perches 提交者: Ingo Molnar

include/asm-x86/genapic_32.h: checkpatch cleanups - formatting only

Signed-off-by: NJoe Perches <joe@perches.com>
Signed-off-by: NIngo Molnar <mingo@elte.hu>
上级 9407913f
...@@ -18,18 +18,18 @@ struct mpc_config_bus; ...@@ -18,18 +18,18 @@ struct mpc_config_bus;
struct mp_config_table; struct mp_config_table;
struct mpc_config_processor; struct mpc_config_processor;
struct genapic { struct genapic {
char *name; char *name;
int (*probe)(void); int (*probe)(void);
int (*apic_id_registered)(void); int (*apic_id_registered)(void);
cpumask_t (*target_cpus)(void); cpumask_t (*target_cpus)(void);
int int_delivery_mode; int int_delivery_mode;
int int_dest_mode; int int_dest_mode;
int ESR_DISABLE; int ESR_DISABLE;
int apic_destination_logical; int apic_destination_logical;
unsigned long (*check_apicid_used)(physid_mask_t bitmap, int apicid); unsigned long (*check_apicid_used)(physid_mask_t bitmap, int apicid);
unsigned long (*check_apicid_present)(int apicid); unsigned long (*check_apicid_present)(int apicid);
int no_balance_irq; int no_balance_irq;
int no_ioapic_check; int no_ioapic_check;
void (*init_apic_ldr)(void); void (*init_apic_ldr)(void);
...@@ -37,21 +37,21 @@ struct genapic { ...@@ -37,21 +37,21 @@ struct genapic {
void (*setup_apic_routing)(void); void (*setup_apic_routing)(void);
int (*multi_timer_check)(int apic, int irq); int (*multi_timer_check)(int apic, int irq);
int (*apicid_to_node)(int logical_apicid); int (*apicid_to_node)(int logical_apicid);
int (*cpu_to_logical_apicid)(int cpu); int (*cpu_to_logical_apicid)(int cpu);
int (*cpu_present_to_apicid)(int mps_cpu); int (*cpu_present_to_apicid)(int mps_cpu);
physid_mask_t (*apicid_to_cpu_present)(int phys_apicid); physid_mask_t (*apicid_to_cpu_present)(int phys_apicid);
void (*setup_portio_remap)(void); void (*setup_portio_remap)(void);
int (*check_phys_apicid_present)(int boot_cpu_physical_apicid); int (*check_phys_apicid_present)(int boot_cpu_physical_apicid);
void (*enable_apic_mode)(void); void (*enable_apic_mode)(void);
u32 (*phys_pkg_id)(u32 cpuid_apic, int index_msb); u32 (*phys_pkg_id)(u32 cpuid_apic, int index_msb);
/* mpparse */ /* mpparse */
/* When one of the next two hooks returns 1 the genapic /* When one of the next two hooks returns 1 the genapic
is switched to this. Essentially they are additional probe is switched to this. Essentially they are additional probe
functions. */ functions. */
int (*mps_oem_check)(struct mp_config_table *mpc, char *oem, int (*mps_oem_check)(struct mp_config_table *mpc, char *oem,
char *productid); char *productid);
int (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id); int (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id);
unsigned (*get_apic_id)(unsigned long x); unsigned (*get_apic_id)(unsigned long x);
...@@ -64,7 +64,7 @@ struct genapic { ...@@ -64,7 +64,7 @@ struct genapic {
void (*send_IPI_allbutself)(int vector); void (*send_IPI_allbutself)(int vector);
void (*send_IPI_all)(int vector); void (*send_IPI_all)(int vector);
#endif #endif
}; };
#define APICFUNC(x) .x = x, #define APICFUNC(x) .x = x,
...@@ -77,39 +77,40 @@ struct genapic { ...@@ -77,39 +77,40 @@ struct genapic {
#define IPIFUNC(x) #define IPIFUNC(x)
#endif #endif
#define APIC_INIT(aname, aprobe) { \ #define APIC_INIT(aname, aprobe) \
.name = aname, \ { \
.probe = aprobe, \ .name = aname, \
.int_delivery_mode = INT_DELIVERY_MODE, \ .probe = aprobe, \
.int_dest_mode = INT_DEST_MODE, \ .int_delivery_mode = INT_DELIVERY_MODE, \
.no_balance_irq = NO_BALANCE_IRQ, \ .int_dest_mode = INT_DEST_MODE, \
.ESR_DISABLE = esr_disable, \ .no_balance_irq = NO_BALANCE_IRQ, \
.apic_destination_logical = APIC_DEST_LOGICAL, \ .ESR_DISABLE = esr_disable, \
APICFUNC(apic_id_registered) \ .apic_destination_logical = APIC_DEST_LOGICAL, \
APICFUNC(target_cpus) \ APICFUNC(apic_id_registered) \
APICFUNC(check_apicid_used) \ APICFUNC(target_cpus) \
APICFUNC(check_apicid_present) \ APICFUNC(check_apicid_used) \
APICFUNC(init_apic_ldr) \ APICFUNC(check_apicid_present) \
APICFUNC(ioapic_phys_id_map) \ APICFUNC(init_apic_ldr) \
APICFUNC(setup_apic_routing) \ APICFUNC(ioapic_phys_id_map) \
APICFUNC(multi_timer_check) \ APICFUNC(setup_apic_routing) \
APICFUNC(apicid_to_node) \ APICFUNC(multi_timer_check) \
APICFUNC(cpu_to_logical_apicid) \ APICFUNC(apicid_to_node) \
APICFUNC(cpu_present_to_apicid) \ APICFUNC(cpu_to_logical_apicid) \
APICFUNC(apicid_to_cpu_present) \ APICFUNC(cpu_present_to_apicid) \
APICFUNC(setup_portio_remap) \ APICFUNC(apicid_to_cpu_present) \
APICFUNC(check_phys_apicid_present) \ APICFUNC(setup_portio_remap) \
APICFUNC(mps_oem_check) \ APICFUNC(check_phys_apicid_present) \
APICFUNC(get_apic_id) \ APICFUNC(mps_oem_check) \
.apic_id_mask = APIC_ID_MASK, \ APICFUNC(get_apic_id) \
APICFUNC(cpu_mask_to_apicid) \ .apic_id_mask = APIC_ID_MASK, \
APICFUNC(acpi_madt_oem_check) \ APICFUNC(cpu_mask_to_apicid) \
IPIFUNC(send_IPI_mask) \ APICFUNC(acpi_madt_oem_check) \
IPIFUNC(send_IPI_allbutself) \ IPIFUNC(send_IPI_mask) \
IPIFUNC(send_IPI_all) \ IPIFUNC(send_IPI_allbutself) \
APICFUNC(enable_apic_mode) \ IPIFUNC(send_IPI_all) \
APICFUNC(phys_pkg_id) \ APICFUNC(enable_apic_mode) \
} APICFUNC(phys_pkg_id) \
}
extern struct genapic *genapic; extern struct genapic *genapic;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册