diff options
author | Jaswinder Singh Rajput <jaswinder@infradead.org> | 2009-01-08 05:12:46 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-08 09:37:37 -0500 |
commit | 41401db698cbb5d1869776bf336881db267e7d19 (patch) | |
tree | 5656143f086618da452e0806d0c7fd05a66412a7 /arch/x86/kernel/mpparse.c | |
parent | 6d652ea1d056390a0c33db92b44ed219284b71af (diff) |
x86: rename intel_mp_floating to mpf_intel
Impact: cleanup, solve 80 columns wrap problems
intel_mp_floating should be renamed to mpf_intel.
The reason: the 'f' in MPF already means 'floating'
which means MP Floating pointer structure -
no need to repeat that in the type name.
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/mpparse.c')
-rw-r--r-- | arch/x86/kernel/mpparse.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index c0601c2848a1..6cea941c4dbb 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c | |||
@@ -569,14 +569,14 @@ static inline void __init construct_default_ISA_mptable(int mpc_default_type) | |||
569 | } | 569 | } |
570 | } | 570 | } |
571 | 571 | ||
572 | static struct intel_mp_floating *mpf_found; | 572 | static struct mpf_intel *mpf_found; |
573 | 573 | ||
574 | /* | 574 | /* |
575 | * Scan the memory blocks for an SMP configuration block. | 575 | * Scan the memory blocks for an SMP configuration block. |
576 | */ | 576 | */ |
577 | static void __init __get_smp_config(unsigned int early) | 577 | static void __init __get_smp_config(unsigned int early) |
578 | { | 578 | { |
579 | struct intel_mp_floating *mpf = mpf_found; | 579 | struct mpf_intel *mpf = mpf_found; |
580 | 580 | ||
581 | if (!mpf) | 581 | if (!mpf) |
582 | return; | 582 | return; |
@@ -687,14 +687,14 @@ static int __init smp_scan_config(unsigned long base, unsigned long length, | |||
687 | unsigned reserve) | 687 | unsigned reserve) |
688 | { | 688 | { |
689 | unsigned int *bp = phys_to_virt(base); | 689 | unsigned int *bp = phys_to_virt(base); |
690 | struct intel_mp_floating *mpf; | 690 | struct mpf_intel *mpf; |
691 | 691 | ||
692 | apic_printk(APIC_VERBOSE, "Scan SMP from %p for %ld bytes.\n", | 692 | apic_printk(APIC_VERBOSE, "Scan SMP from %p for %ld bytes.\n", |
693 | bp, length); | 693 | bp, length); |
694 | BUILD_BUG_ON(sizeof(*mpf) != 16); | 694 | BUILD_BUG_ON(sizeof(*mpf) != 16); |
695 | 695 | ||
696 | while (length > 0) { | 696 | while (length > 0) { |
697 | mpf = (struct intel_mp_floating *)bp; | 697 | mpf = (struct mpf_intel *)bp; |
698 | if ((*bp == SMP_MAGIC_IDENT) && | 698 | if ((*bp == SMP_MAGIC_IDENT) && |
699 | (mpf->mpf_length == 1) && | 699 | (mpf->mpf_length == 1) && |
700 | !mpf_checksum((unsigned char *)bp, 16) && | 700 | !mpf_checksum((unsigned char *)bp, 16) && |
@@ -1000,7 +1000,7 @@ static int __init update_mp_table(void) | |||
1000 | { | 1000 | { |
1001 | char str[16]; | 1001 | char str[16]; |
1002 | char oem[10]; | 1002 | char oem[10]; |
1003 | struct intel_mp_floating *mpf; | 1003 | struct mpf_intel *mpf; |
1004 | struct mpc_table *mpc, *mpc_new; | 1004 | struct mpc_table *mpc, *mpc_new; |
1005 | 1005 | ||
1006 | if (!enable_update_mptable) | 1006 | if (!enable_update_mptable) |
@@ -1052,7 +1052,7 @@ static int __init update_mp_table(void) | |||
1052 | mpc = mpc_new; | 1052 | mpc = mpc_new; |
1053 | /* check if we can modify that */ | 1053 | /* check if we can modify that */ |
1054 | if (mpc_new_phys - mpf->mpf_physptr) { | 1054 | if (mpc_new_phys - mpf->mpf_physptr) { |
1055 | struct intel_mp_floating *mpf_new; | 1055 | struct mpf_intel *mpf_new; |
1056 | /* steal 16 bytes from [0, 1k) */ | 1056 | /* steal 16 bytes from [0, 1k) */ |
1057 | printk(KERN_INFO "mpf new: %x\n", 0x400 - 16); | 1057 | printk(KERN_INFO "mpf new: %x\n", 0x400 - 16); |
1058 | mpf_new = phys_to_virt(0x400 - 16); | 1058 | mpf_new = phys_to_virt(0x400 - 16); |