diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-10-15 15:08:14 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-10-15 15:18:59 -0400 |
| commit | 40ffa93791985ab300fd488072e9f37ccf72e88c (patch) | |
| tree | a20192de6aa86ad4f69251cde0bcda86f20b5ec5 | |
| parent | 234bb549eea16ec7d5207ba747fb8dbf489e64c1 (diff) | |
x86: Remove stale pmtimer_64.c
This file is unused since the apic unification in 2.6.29, but nobody
noticed.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/x86/kernel/Makefile | 1 | ||||
| -rw-r--r-- | arch/x86/kernel/pmtimer_64.c | 69 | ||||
| -rw-r--r-- | include/linux/acpi_pmtmr.h | 2 |
3 files changed, 0 insertions, 72 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 0925676266bd..dd9a2e459c78 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
| @@ -120,7 +120,6 @@ obj-$(CONFIG_SWIOTLB) += pci-swiotlb.o | |||
| 120 | # 64 bit specific files | 120 | # 64 bit specific files |
| 121 | ifeq ($(CONFIG_X86_64),y) | 121 | ifeq ($(CONFIG_X86_64),y) |
| 122 | obj-$(CONFIG_X86_UV) += tlb_uv.o bios_uv.o uv_irq.o uv_sysfs.o uv_time.o | 122 | obj-$(CONFIG_X86_UV) += tlb_uv.o bios_uv.o uv_irq.o uv_sysfs.o uv_time.o |
| 123 | obj-$(CONFIG_X86_PM_TIMER) += pmtimer_64.o | ||
| 124 | obj-$(CONFIG_AUDIT) += audit_64.o | 123 | obj-$(CONFIG_AUDIT) += audit_64.o |
| 125 | 124 | ||
| 126 | obj-$(CONFIG_GART_IOMMU) += pci-gart_64.o aperture_64.o | 125 | obj-$(CONFIG_GART_IOMMU) += pci-gart_64.o aperture_64.o |
diff --git a/arch/x86/kernel/pmtimer_64.c b/arch/x86/kernel/pmtimer_64.c deleted file mode 100644 index b112406f1996..000000000000 --- a/arch/x86/kernel/pmtimer_64.c +++ /dev/null | |||
| @@ -1,69 +0,0 @@ | |||
| 1 | /* Ported over from i386 by AK, original copyright was: | ||
| 2 | * | ||
| 3 | * (C) Dominik Brodowski <linux@brodo.de> 2003 | ||
| 4 | * | ||
| 5 | * Driver to use the Power Management Timer (PMTMR) available in some | ||
| 6 | * southbridges as primary timing source for the Linux kernel. | ||
| 7 | * | ||
| 8 | * Based on parts of linux/drivers/acpi/hardware/hwtimer.c, timer_pit.c, | ||
| 9 | * timer_hpet.c, and on Arjan van de Ven's implementation for 2.4. | ||
| 10 | * | ||
| 11 | * This file is licensed under the GPL v2. | ||
| 12 | * | ||
| 13 | * Dropped all the hardware bug workarounds for now. Hopefully they | ||
| 14 | * are not needed on 64bit chipsets. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #include <linux/jiffies.h> | ||
| 18 | #include <linux/kernel.h> | ||
| 19 | #include <linux/time.h> | ||
| 20 | #include <linux/init.h> | ||
| 21 | #include <linux/cpumask.h> | ||
| 22 | #include <linux/acpi_pmtmr.h> | ||
| 23 | |||
| 24 | #include <asm/io.h> | ||
| 25 | #include <asm/proto.h> | ||
| 26 | #include <asm/msr.h> | ||
| 27 | #include <asm/vsyscall.h> | ||
| 28 | |||
| 29 | static inline u32 cyc2us(u32 cycles) | ||
| 30 | { | ||
| 31 | /* The Power Management Timer ticks at 3.579545 ticks per microsecond. | ||
| 32 | * 1 / PM_TIMER_FREQUENCY == 0.27936511 =~ 286/1024 [error: 0.024%] | ||
| 33 | * | ||
| 34 | * Even with HZ = 100, delta is at maximum 35796 ticks, so it can | ||
| 35 | * easily be multiplied with 286 (=0x11E) without having to fear | ||
| 36 | * u32 overflows. | ||
| 37 | */ | ||
| 38 | cycles *= 286; | ||
| 39 | return (cycles >> 10); | ||
| 40 | } | ||
| 41 | |||
| 42 | static unsigned pmtimer_wait_tick(void) | ||
| 43 | { | ||
| 44 | u32 a, b; | ||
| 45 | for (a = b = inl(pmtmr_ioport) & ACPI_PM_MASK; | ||
| 46 | a == b; | ||
| 47 | b = inl(pmtmr_ioport) & ACPI_PM_MASK) | ||
| 48 | cpu_relax(); | ||
| 49 | return b; | ||
| 50 | } | ||
| 51 | |||
| 52 | /* note: wait time is rounded up to one tick */ | ||
| 53 | void pmtimer_wait(unsigned us) | ||
| 54 | { | ||
| 55 | u32 a, b; | ||
| 56 | a = pmtimer_wait_tick(); | ||
| 57 | do { | ||
| 58 | b = inl(pmtmr_ioport); | ||
| 59 | cpu_relax(); | ||
| 60 | } while (cyc2us(b - a) < us); | ||
| 61 | } | ||
| 62 | |||
| 63 | static int __init nopmtimer_setup(char *s) | ||
| 64 | { | ||
| 65 | pmtmr_ioport = 0; | ||
| 66 | return 1; | ||
| 67 | } | ||
| 68 | |||
| 69 | __setup("nopmtimer", nopmtimer_setup); | ||
diff --git a/include/linux/acpi_pmtmr.h b/include/linux/acpi_pmtmr.h index 7e3d2859be50..1d0ef1ae8036 100644 --- a/include/linux/acpi_pmtmr.h +++ b/include/linux/acpi_pmtmr.h | |||
| @@ -25,8 +25,6 @@ static inline u32 acpi_pm_read_early(void) | |||
| 25 | return acpi_pm_read_verified() & ACPI_PM_MASK; | 25 | return acpi_pm_read_verified() & ACPI_PM_MASK; |
| 26 | } | 26 | } |
| 27 | 27 | ||
| 28 | extern void pmtimer_wait(unsigned); | ||
| 29 | |||
| 30 | #else | 28 | #else |
| 31 | 29 | ||
| 32 | static inline u32 acpi_pm_read_early(void) | 30 | static inline u32 acpi_pm_read_early(void) |
