Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 112670
b: refs/heads/master
c: 9a8f0e6
h: refs/heads/master
v: v3
  • Loading branch information
Suresh Siddha authored and Ingo Molnar committed Jul 18, 2008
1 parent 94ce95f commit 0e15344
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 49 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 94a8c3c2437c8946f1b6c8e0b2c560a7db8ed3c6
refs/heads/master: 9a8f0e6b5dfe3b4f330fc82b16a4000f5688fce8
5 changes: 5 additions & 0 deletions trunk/arch/x86/kernel/apic_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,11 @@ static int modern_apic(void)
return lapic_get_version() >= 0x14;
}

/*
* Paravirt kernels also might be using these below ops. So we still
* use generic apic_read()/apic_write(), which might be pointing to different
* ops in PARAVIRT case.
*/
void xapic_wait_icr_idle(void)
{
while (apic_read(APIC_ICR) & APIC_ICR_BUSY)
Expand Down
51 changes: 3 additions & 48 deletions trunk/arch/x86/kernel/vmi_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -676,50 +676,6 @@ static inline int __init probe_vmi_rom(void)
return 0;
}

#ifdef CONFIG_X86_LOCAL_APIC
static u32 vmi_apic_read(u32 reg)
{
return 0;
}

static void vmi_apic_write(u32 reg, u32 val)
{
/* Warn to see if there's any stray references */
WARN_ON(1);
}

static u64 vmi_apic_icr_read(void)
{
return 0;
}

static void vmi_apic_icr_write(u32 low, u32 id)
{
/* Warn to see if there's any stray references */
WARN_ON(1);
}

static void vmi_apic_wait_icr_idle(void)
{
return;
}

static u32 vmi_safe_apic_wait_icr_idle(void)
{
return 0;
}

static struct apic_ops vmi_basic_apic_ops = {
.read = vmi_apic_read,
.write = vmi_apic_write,
.write_atomic = vmi_apic_write,
.icr_read = vmi_apic_icr_read,
.icr_write = vmi_apic_icr_write,
.wait_icr_idle = vmi_apic_wait_icr_idle,
.safe_wait_icr_idle = vmi_safe_apic_wait_icr_idle,
};
#endif

/*
* VMI setup common to all processors
*/
Expand Down Expand Up @@ -948,10 +904,9 @@ static inline int __init activate_vmi(void)
#endif

#ifdef CONFIG_X86_LOCAL_APIC
para_fill(vmi_basic_apic_ops.read, APICRead);
para_fill(vmi_basic_apic_ops.write, APICWrite);
para_fill(vmi_basic_apic_ops.write_atomic, APICWrite);
apic_ops = &vmi_basic_apic_ops;
para_fill(apic_ops->read, APICRead);
para_fill(apic_ops->write, APICWrite);
para_fill(apic_ops->write_atomic, APICWrite);
#endif

/*
Expand Down

0 comments on commit 0e15344

Please sign in to comment.