diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-17 10:28:46 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-17 11:53:57 -0500 |
commit | be163a159b223e94b3180afdd47a8d468eb9a492 (patch) | |
tree | d071a8b0a6d56e84c274bc9a2b1f7d302b0ed524 /arch/x86/include | |
parent | ab6fb7c0b03e2c3286f316c840347be8b9ee3d9f (diff) |
x86, apic: rename 'genapic' to 'apic'
Impact: cleanup
Now that all APIC code is consolidated there's nothing 'gen' about
apics anymore - so rename 'struct genapic' to 'struct apic'.
This shortens the code and is nicer to read as well.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include')
-rw-r--r-- | arch/x86/include/asm/apic.h | 18 | ||||
-rw-r--r-- | arch/x86/include/asm/setup.h | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 122d8eda275f..dce1bf696cca 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h | |||
@@ -248,7 +248,7 @@ static inline void disable_local_APIC(void) { } | |||
248 | * Martin Bligh, Andi Kleen, James Bottomley, John Stultz, and | 248 | * Martin Bligh, Andi Kleen, James Bottomley, John Stultz, and |
249 | * James Cleverdon. | 249 | * James Cleverdon. |
250 | */ | 250 | */ |
251 | struct genapic { | 251 | struct apic { |
252 | char *name; | 252 | char *name; |
253 | 253 | ||
254 | int (*probe)(void); | 254 | int (*probe)(void); |
@@ -283,7 +283,7 @@ struct genapic { | |||
283 | int (*phys_pkg_id)(int cpuid_apic, int index_msb); | 283 | int (*phys_pkg_id)(int cpuid_apic, int index_msb); |
284 | 284 | ||
285 | /* | 285 | /* |
286 | * When one of the next two hooks returns 1 the genapic | 286 | * When one of the next two hooks returns 1 the apic |
287 | * is switched to this. Essentially they are additional | 287 | * is switched to this. Essentially they are additional |
288 | * probe functions: | 288 | * probe functions: |
289 | */ | 289 | */ |
@@ -324,7 +324,7 @@ struct genapic { | |||
324 | u32 (*safe_wait_icr_idle)(void); | 324 | u32 (*safe_wait_icr_idle)(void); |
325 | }; | 325 | }; |
326 | 326 | ||
327 | extern struct genapic *apic; | 327 | extern struct apic *apic; |
328 | 328 | ||
329 | static inline u32 apic_read(u32 reg) | 329 | static inline u32 apic_read(u32 reg) |
330 | { | 330 | { |
@@ -385,17 +385,17 @@ static inline unsigned default_get_apic_id(unsigned long x) | |||
385 | #define DEFAULT_TRAMPOLINE_PHYS_HIGH 0x469 | 385 | #define DEFAULT_TRAMPOLINE_PHYS_HIGH 0x469 |
386 | 386 | ||
387 | #ifdef CONFIG_X86_32 | 387 | #ifdef CONFIG_X86_32 |
388 | extern void es7000_update_genapic_to_cluster(void); | 388 | extern void es7000_update_apic_to_cluster(void); |
389 | #else | 389 | #else |
390 | extern struct genapic apic_flat; | 390 | extern struct apic apic_flat; |
391 | extern struct genapic apic_physflat; | 391 | extern struct apic apic_physflat; |
392 | extern struct genapic apic_x2apic_cluster; | 392 | extern struct apic apic_x2apic_cluster; |
393 | extern struct genapic apic_x2apic_phys; | 393 | extern struct apic apic_x2apic_phys; |
394 | extern int default_acpi_madt_oem_check(char *, char *); | 394 | extern int default_acpi_madt_oem_check(char *, char *); |
395 | 395 | ||
396 | extern void apic_send_IPI_self(int vector); | 396 | extern void apic_send_IPI_self(int vector); |
397 | 397 | ||
398 | extern struct genapic apic_x2apic_uv_x; | 398 | extern struct apic apic_x2apic_uv_x; |
399 | DECLARE_PER_CPU(int, x2apic_extra_bits); | 399 | DECLARE_PER_CPU(int, x2apic_extra_bits); |
400 | 400 | ||
401 | extern int default_cpu_present_to_apicid(int mps_cpu); | 401 | extern int default_cpu_present_to_apicid(int mps_cpu); |
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index c230189462a2..8029369cd6f4 100644 --- a/arch/x86/include/asm/setup.h +++ b/arch/x86/include/asm/setup.h | |||
@@ -30,7 +30,7 @@ struct x86_quirks { | |||
30 | void (*smp_read_mpc_oem)(struct mpc_oemtable *oemtable, | 30 | void (*smp_read_mpc_oem)(struct mpc_oemtable *oemtable, |
31 | unsigned short oemsize); | 31 | unsigned short oemsize); |
32 | int (*setup_ioapic_ids)(void); | 32 | int (*setup_ioapic_ids)(void); |
33 | int (*update_genapic)(void); | 33 | int (*update_apic)(void); |
34 | }; | 34 | }; |
35 | 35 | ||
36 | #endif /* __ASSEMBLY__ */ | 36 | #endif /* __ASSEMBLY__ */ |