Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-29 19:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86, es7000: clean up es7000_enable_apic_mode()

Browse Source 
- eliminate the needless es7000_enable_apic_mode() complication which
  was not apparent prior the namespace cleanups

- clean up the control flow in es7000_enable_apic_mode()

- other cleanups

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2009-01-28 13:15:06 +01:00
parent 4904033302
commit b0b20e5a3a
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/es7000/apic.h
View File

@ -36,6 +36,8 @@ static inline unsigned long es7000_check_apicid_present(int bit)
return physid_isset(bit, phys_cpu_present_map);
}
extern void es7000_enable_apic_mode(void);
#define apicid_cluster(apicid) (apicid & 0xF0)
static inline unsigned long calculate_ldr(int cpu)

25
arch/x86/kernel/es7000_32.c
View File

@ -359,20 +359,21 @@ es7000_mip_write(struct mip_reg *mip_reg)
return status;
}
void __init
es7000_sw_apic(void)
void __init es7000_enable_apic_mode(void)
{
if (es7000_plat) {
int mip_status;
struct mip_reg es7000_mip_reg;
struct mip_reg es7000_mip_reg;
int mip_status;
printk("ES7000: Enabling APIC mode.\n");
memset(&es7000_mip_reg, 0, sizeof(struct mip_reg));
es7000_mip_reg.off_0 = MIP_SW_APIC;
es7000_mip_reg.off_38 = (MIP_VALID);
while ((mip_status = es7000_mip_write(&es7000_mip_reg)) != 0)
printk("es7000_sw_apic: command failed, status = %x\n",
mip_status);
if (!es7000_plat)
return;
printk("ES7000: Enabling APIC mode.\n");
memset(&es7000_mip_reg, 0, sizeof(struct mip_reg));
es7000_mip_reg.off_0 = MIP_SW_APIC;
es7000_mip_reg.off_38 = MIP_VALID;
while ((mip_status = es7000_mip_write(&es7000_mip_reg)) != 0) {
printk("es7000_enable_apic_mode: command failed, status = %x\n",
mip_status);
}
}

7
arch/x86/mach-generic/es7000.c
View File

@ -35,13 +35,6 @@ static int probe_es7000(void)
return 0;
}
extern void es7000_sw_apic(void);
static void __init es7000_enable_apic_mode(void)
{
es7000_sw_apic();
}
static __init int
mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
{