Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 09:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: rename intel_mp_floating to mpf_intel

Browse Source 
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>
This commit is contained in:
Jaswinder Singh Rajput 2009-01-08 15:42:46 +05:30 committed by Ingo Molnar
parent 6d652ea1d0
commit 41401db698
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/include/asm/mpspec_def.h
View File

@ -24,7 +24,8 @@
# endif # endif
#endif #endif
struct intel_mp_floating { /* Intel MP Floating Pointer Structure */
struct mpf_intel {
char mpf_signature[4]; /* "_MP_" */ char mpf_signature[4]; /* "_MP_" */
unsigned int mpf_physptr; /* Configuration table address */ unsigned int mpf_physptr; /* Configuration table address */
unsigned char mpf_length; /* Our length (paragraphs) */ unsigned char mpf_length; /* Our length (paragraphs) */

12
arch/x86/kernel/mpparse.c
View File

@ -569,14 +569,14 @@ static inline void __init construct_default_ISA_mptable(int mpc_default_type)
} }
} }
static struct intel_mp_floating *mpf_found; static struct mpf_intel *mpf_found;
/* /*
* Scan the memory blocks for an SMP configuration block. * Scan the memory blocks for an SMP configuration block.
*/ */
static void __init __get_smp_config(unsigned int early) static void __init __get_smp_config(unsigned int early)
{ {
struct intel_mp_floating *mpf = mpf_found; struct mpf_intel *mpf = mpf_found;
if (!mpf) if (!mpf)
return; return;
@ -687,14 +687,14 @@ static int __init smp_scan_config(unsigned long base, unsigned long length,
unsigned reserve) unsigned reserve)
{ {
unsigned int *bp = phys_to_virt(base); unsigned int *bp = phys_to_virt(base);
struct intel_mp_floating *mpf; struct mpf_intel *mpf;
apic_printk(APIC_VERBOSE, "Scan SMP from %p for %ld bytes.\n", apic_printk(APIC_VERBOSE, "Scan SMP from %p for %ld bytes.\n",
bp, length); bp, length);
BUILD_BUG_ON(sizeof(*mpf) != 16); BUILD_BUG_ON(sizeof(*mpf) != 16);
while (length > 0) { while (length > 0) {
mpf = (struct intel_mp_floating *)bp; mpf = (struct mpf_intel *)bp;
if ((*bp == SMP_MAGIC_IDENT) && if ((*bp == SMP_MAGIC_IDENT) &&
(mpf->mpf_length == 1) && (mpf->mpf_length == 1) &&
!mpf_checksum((unsigned char *)bp, 16) && !mpf_checksum((unsigned char *)bp, 16) &&
@ -1000,7 +1000,7 @@ static int __init update_mp_table(void)
{ {
char str[16]; char str[16];
char oem[10]; char oem[10];
struct intel_mp_floating *mpf; struct mpf_intel *mpf;
struct mpc_table *mpc, *mpc_new; struct mpc_table *mpc, *mpc_new;
if (!enable_update_mptable) if (!enable_update_mptable)
@ -1052,7 +1052,7 @@ static int __init update_mp_table(void)
mpc = mpc_new; mpc = mpc_new;
/* check if we can modify that */ /* check if we can modify that */
if (mpc_new_phys - mpf->mpf_physptr) { if (mpc_new_phys - mpf->mpf_physptr) {
struct intel_mp_floating *mpf_new; struct mpf_intel *mpf_new;
/* steal 16 bytes from [0, 1k) */ /* steal 16 bytes from [0, 1k) */
printk(KERN_INFO "mpf new: %x\n", 0x400 - 16); printk(KERN_INFO "mpf new: %x\n", 0x400 - 16);
mpf_new = phys_to_virt(0x400 - 16); mpf_new = phys_to_virt(0x400 - 16);