In 2.6.18, replace times with clockevents. arch/i386/kernel/timers/ was removed.
`pit_latch_buggy' was referred in timers/timer_tsc.c, and currently removed.
Therefore nobody refer it. It has no effect already.
Signed-off-by: TAKADA Yoshihito <[email protected]>
diff -Narup a/arch/i386/kernel/cpu/cyrix.c b/arch/i386/kernel/cpu/cyrix.c
--- a/arch/i386/kernel/cpu/cyrix.c 2007-04-26 12:08:32.000000000 +0900
+++ b/arch/i386/kernel/cpu/cyrix.c 2007-06-28 12:13:13.000000000 +0900
@@ -6,7 +6,6 @@
#include <asm/io.h>
#include <asm/processor.h>
#include <asm/timer.h>
-#include <asm/pci-direct.h>
#include "cpu.h"
@@ -251,8 +250,6 @@ static void __cpuinit init_cyrix(struct
case 4: /* MediaGX/GXm or Geode GXM/GXLV/GX1 */
#ifdef CONFIG_PCI
- {
- u32 vendor, device;
/* It isn't really a PCI quirk directly, but the cure is the
same. The MediaGX has deep magic SMM stuff that handles the
SB emulation. It thows away the fifo on disable_dma() which
@@ -267,20 +264,6 @@ static void __cpuinit init_cyrix(struct
printk(KERN_INFO "Working around Cyrix MediaGX virtual DMA bugs.\n");
isa_dma_bridge_buggy = 2;
-
- /* We do this before the PCI layer is running. However we
- are safe here as we know the bridge must be a Cyrix
- companion and must be present */
- vendor = read_pci_config_16(0, 0, 0x12, PCI_VENDOR_ID);
- device = read_pci_config_16(0, 0, 0x12, PCI_DEVICE_ID);
-
- /*
- * The 5510/5520 companion chips have a funky PIT.
- */
- if (vendor == PCI_VENDOR_ID_CYRIX &&
- (device == PCI_DEVICE_ID_CYRIX_5510 || device == PCI_DEVICE_ID_CYRIX_5520))
- pit_latch_buggy = 1;
- }
#endif
c->x86_cache_size=16; /* Yep 16K integrated cache thats it */
diff -Narup a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c
--- a/arch/i386/kernel/time.c 2007-04-26 12:08:32.000000000 +0900
+++ b/arch/i386/kernel/time.c 2007-06-26 10:15:34.000000000 +0900
@@ -70,8 +70,6 @@
#include <asm/i8259.h>
-int pit_latch_buggy; /* extern */
-
#include "do_timer.h"
unsigned int cpu_khz; /* Detected as we calibrate the TSC */
diff -Narup a/include/asm-i386/timer.h b/include/asm-i386/timer.h
--- a/include/asm-i386/timer.h 2007-04-26 12:08:32.000000000 +0900
+++ b/include/asm-i386/timer.h 2007-06-26 10:17:02.000000000 +0900
@@ -10,7 +10,6 @@ unsigned long long native_sched_clock(vo
unsigned long native_calculate_cpu_khz(void);
/* Modifiers for buggy PIT handling */
-extern int pit_latch_buggy;
extern int timer_ack;
extern int no_timer_check;
extern int no_sync_cmos_clock;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
