Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb758e96 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-core-for-linus' of... 

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  hrtimers: fix warning in kernel/hrtimer.c
  x86: make sure we really have an hpet mapping before using it
  x86: enable HPET on Fujitsu u9200
  linux/timex.h: cleanup for userspace
  posix-timers: simplify de_thread()->exit_itimers() path
  posix-timers: check ->it_signal instead of ->it_pid to validate the timer
  posix-timers: use "struct pid*" instead of "struct task_struct*"
  nohz: suppress needless timer reprogramming
  clocksource, acpi_pm.c: put acpi_pm_read_slow() under CONFIG_PCI
  nohz: no softirq pending warnings for offline cpus
  hrtimer: removing all ur callback modes, fix
  hrtimer: removing all ur callback modes, fix hotplug
  hrtimer: removing all ur callback modes
  x86: correct link to HPET timer specification
  rtc-cmos: export second NVRAM bank

Fixed up conflicts in sound/drivers/pcsp/pcsp.c and sound/core/hrtimer.c
manually.
parents 5f34fe1c 32e8d186

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ config HPET_TIMER 
         The HPET provides a stable time base on SMP

         systems, unlike the TSC, but it is more expensive to access,

         as it is off-chip.  You can find the HPET spec at

         <http://www.intel.com/hardwaredesign/hpetspec.htm>.

         <http://www.intel.com/hardwaredesign/hpetspec_1.pdf>.



         You can safely choose Y here.  However, HPET will only be

         activated if the platform and the BIOS support this feature.

arch/x86/kernel/hpet.c

+4 −3
Original line number Diff line number Diff line
@@ -813,7 +813,7 @@ int __init hpet_enable(void) 


out_nohpet:

	hpet_clear_mapping();

	boot_hpet_disable = 1;

	hpet_address = 0;

	return 0;

}
@@ -836,9 +836,10 @@ static __init int hpet_late_init(void) 


		hpet_address = force_hpet_address;

		hpet_enable();

	}



	if (!hpet_virt_address)

		return -ENODEV;

	}



	hpet_reserve_platform_timers(hpet_readl(HPET_ID));

arch/x86/kernel/quirks.c

+2 −0
Original line number Diff line number Diff line
@@ -168,6 +168,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_31, 
			 ich_force_enable_hpet);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_1,

			 ich_force_enable_hpet);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_4,

			 ich_force_enable_hpet);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_7,

			 ich_force_enable_hpet);

drivers/char/hpet.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
/*

 * The High Precision Event Timer driver.

 * This driver is closely modelled after the rtc.c driver.

 * http://www.intel.com/hardwaredesign/hpetspec.htm

 * http://www.intel.com/hardwaredesign/hpetspec_1.pdf

 */

#define	HPET_USER_FREQ	(64)

#define	HPET_DRIFT	(500)

drivers/clocksource/acpi_pm.c

+5 −5
Original line number Diff line number Diff line
@@ -57,11 +57,6 @@ u32 acpi_pm_read_verified(void) 
	return v2;

}



static cycle_t acpi_pm_read_slow(void)

{

	return (cycle_t)acpi_pm_read_verified();

}



static cycle_t acpi_pm_read(void)

{

	return (cycle_t)read_pmtmr();
@@ -88,6 +83,11 @@ static int __init acpi_pm_good_setup(char *__str) 
}

__setup("acpi_pm_good", acpi_pm_good_setup);



static cycle_t acpi_pm_read_slow(void)

{

	return (cycle_t)acpi_pm_read_verified();

}



static inline void acpi_pm_need_workaround(void)

{

	clocksource_acpi_pm.read = acpi_pm_read_slow;