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

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

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

* 'timers/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: add PCI ID for 6300ESB force hpet
  x86: add another PCI ID for ICH6 force-hpet
  kernel-paramaters: document pmtmr= command line option
  acpi_pm clccksource: fix printk format warning
  nohz: don't stop idle tick if softirqs are pending.
  pmtmr: allow command line override of ioport
  nohz: reduce jiffies polling overhead
  hrtimer: Remove unused variables in ktime_divns()
  hrtimer: remove warning in hres_timers_resume
  posix-timers: print RT watchdog message
parents 61d97f4f 7dc97196

Documentation/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -1612,6 +1612,10 @@ and is between 256 and 4096 characters. It is defined in the file 
			Format: { parport<nr> | timid | 0 }

			See also Documentation/parport.txt.



	pmtmr=		[X86] Manual setup of pmtmr I/O Port. 

			Override pmtimer IOPort with a hex value.

			e.g. pmtmr=0x508



	pnpacpi=	[ACPI]

			{ off }

arch/x86/kernel/quirks.c

+2 −0
Original line number Diff line number Diff line
@@ -266,6 +266,8 @@ static void old_ich_force_enable_hpet_user(struct pci_dev *dev) 
		hpet_print_force_info();

}



DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_1,

			 old_ich_force_enable_hpet_user);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0,

			 old_ich_force_enable_hpet_user);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12,

drivers/clocksource/acpi_pm.c

+19 −0
Original line number Diff line number Diff line
@@ -215,3 +215,22 @@ static int __init init_acpi_pm_clocksource(void) 
 * but we still need to load before device_initcall

 */

fs_initcall(init_acpi_pm_clocksource);



/*

 * Allow an override of the IOPort. Stupid BIOSes do not tell us about

 * the PMTimer, but we might know where it is.

 */

static int __init parse_pmtmr(char *arg)

{

	unsigned long base;



	if (strict_strtoul(arg, 16, &base))

		return -EINVAL;



	printk(KERN_INFO "PMTMR IOPort override: 0x%04x -> 0x%04x\n",

	       (unsigned int)pmtmr_ioport, base);

	pmtmr_ioport = base;



	return 1;

}

__setup("pmtmr=", parse_pmtmr);

kernel/hrtimer.c

+2 −5
Original line number Diff line number Diff line
@@ -300,11 +300,10 @@ EXPORT_SYMBOL_GPL(ktime_sub_ns); 
 */

u64 ktime_divns(const ktime_t kt, s64 div)

{

	u64 dclc, inc, dns;

	u64 dclc;

	int sft = 0;



	dclc = dns = ktime_to_ns(kt);

	inc = div;

	dclc = ktime_to_ns(kt);

	/* Make sure the divisor is less than 2^32: */

	while (div >> 32) {

		sft++;
@@ -632,8 +631,6 @@ void clock_was_set(void) 
 */

void hres_timers_resume(void)

{

	WARN_ON_ONCE(num_online_cpus() > 1);



	/* Retrigger the CPU local events: */

	retrigger_next_event(NULL);

}

kernel/posix-cpu-timers.c

+3 −0
Original line number Diff line number Diff line
@@ -1037,6 +1037,9 @@ static void check_thread_timers(struct task_struct *tsk, 
				sig->rlim[RLIMIT_RTTIME].rlim_cur +=

								USEC_PER_SEC;

			}

			printk(KERN_INFO

				"RT Watchdog Timeout: %s[%d]\n",

				tsk->comm, task_pid_nr(tsk));

			__group_send_sig_info(SIGXCPU, SEND_SIG_PRIV, tsk);

		}

	}