diff options
| author | Linus Torvalds | 2006-02-28 05:41:56 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2006-02-28 05:41:56 +0100 |
| commit | 637029c6cb5efcbaa3d5831af4c1972bdd629779 (patch) | |
| tree | cd6d32dceef73f0ad467f495f51f331a459d01db /arch/i386/kernel/acpi | |
| parent | Merge git://oss.sgi.com:8090/oss/git/xfs-rc-fixes (diff) | |
| download | kernel-qcow2-linux-637029c6cb5efcbaa3d5831af4c1972bdd629779.tar.gz kernel-qcow2-linux-637029c6cb5efcbaa3d5831af4c1972bdd629779.tar.xz kernel-qcow2-linux-637029c6cb5efcbaa3d5831af4c1972bdd629779.zip | |
Revert "[PATCH] x86_64: Only do the clustered systems have unsynchronized TSC assumption on IBM systems"
This reverts commit 13a229abc25640813f1480c0478dfc6bdbc1c19e.
Quoth Andi:
"After some consideration and feedback from various people it turns
out this wasn't that good an idea. It has some problems and needs
more work. Since it was only an optimization anyways it's best to
just back it out again for now."
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/kernel/acpi')
| -rw-r--r-- | arch/i386/kernel/acpi/boot.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index 8309a7b2cd63..79577f0ace98 100644 --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c @@ -44,6 +44,9 @@ extern void __init clustered_apic_check(void); extern int gsi_irq_sharing(int gsi); #include <asm/proto.h> +static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id) { return 0; } + + #else /* X86 */ #ifdef CONFIG_X86_LOCAL_APIC |