linux-next: manual merge of the timers tree

linux-next: manual merge of the timers tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 682 bytes --]

Hi all,

Today's linux-next merge of the timers tree got a conflict in
arch/x86/oprofile/nmi_int.c between commit
accba5f3965d6a9d1bf7c1e1a7995d17e9d521b6 ("Merge branch 'linus' into
oprofile-v2") from Linus' tree and commit
1a960b402a51d80abf54e3f8e4972374ffe5f22d ("Oprofile Multiplexing Patch")
from the timers tree.

Also, it looks like commit 0329693bf72584efd84dde19997ee4f0c54f8d57
("Merge branch 'linus' into irq/sparseirq") in the timers tree is a bad
merge and causes anothe conflict with Linus' tree.

I fixed them up using the obvious bits of each.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the timers tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the timers tree got a conflict in
kernel/time/tick-sched.c between commit
6a7b3dc3440f7b5a9b67594af01ed562cdeb41e4 ("sched: convert nohz_cpu_mask
to cpumask_var_t") from the cpus4096 tree and commit
001474491fabeca233168a8598f721c808040f90 ("nohz: suppress needless timer
reprogramming") from the timers tree.

Just context changing.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc kernel/time/tick-sched.c
index 70f872c,8f3fc25..0000000
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@@ -282,8 -282,31 +282,31 @@@ void tick_nohz_stop_sched_tick(int inid
  	/* Schedule the tick, if we are at least one jiffie off */
  	if ((long)delta_jiffies >= 1) {
  
+ 		/*
+ 		* calculate the expiry time for the next timer wheel
+ 		* timer
+ 		*/
+ 		expires = ktime_add_ns(last_update, tick_period.tv64 *
+ 				   delta_jiffies);
+ 
+ 		/*
+ 		 * If this cpu is the one which updates jiffies, then
+ 		 * give up the assignment and let it be taken by the
+ 		 * cpu which runs the tick timer next, which might be
+ 		 * this cpu as well. If we don't drop this here the
+ 		 * jiffies might be stale and do_timer() never
+ 		 * invoked.
+ 		 */
+ 		if (cpu == tick_do_timer_cpu)
+ 			tick_do_timer_cpu = TICK_DO_TIMER_NONE;
+ 
  		if (delta_jiffies > 1)
 -			cpu_set(cpu, nohz_cpu_mask);
 +			cpumask_set_cpu(cpu, nohz_cpu_mask);
+ 
+ 		/* Skip reprogram of event if its not changed */
+ 		if (ts->tick_stopped && ktime_equal(expires, dev->next_event))
+ 			goto out;
+ 
  		/*
  		 * nohz_stop_sched_tick can be called several times before
  		 * the nohz_restart_sched_tick is called. This happens when

Re: linux-next: manual merge of the timers tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 326 bytes --]

Hi Ingo,

On Tue, 21 Oct 2008 14:15:08 +0200 Ingo Molnar <mingo@elte.hu> wrote:
>
> I have also pushed out a new tip/auto-timers-next tree which is 
> conflict-free with latest -git. (it is the same)

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the timers tree

[Ingo Molnar]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next merge of the timers tree got a conflict in
> kernel/time/tick-sched.c between commit
> c34bec5a44e9486597d78e7a686b2f9088a0564c ("") from Linus' tree and commit
> cc584b213f252bf698849cf4be2377cd3ec7501a ("hrtimer: convert kernel/* to
> the new hrtimer apis") from the timers tree.
> 
> The former moved the code that the latter modified.  I fixed it up (see
> below).

thanks Stephen!

I have also pushed out a new tip/auto-timers-next tree which is 
conflict-free with latest -git. (it is the same)

	Ingo

linux-next: manual merge of the timers tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the timers tree got a conflict in
kernel/time/tick-sched.c between commit
c34bec5a44e9486597d78e7a686b2f9088a0564c ("") from Linus' tree and commit
cc584b213f252bf698849cf4be2377cd3ec7501a ("hrtimer: convert kernel/* to
the new hrtimer apis") from the timers tree.

The former moved the code that the latter modified.  I fixed it up (see
below).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc kernel/time/tick-sched.c
index 0581c11,55b0e91..0000000
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@@ -377,32 -377,6 +377,32 @@@ ktime_t tick_nohz_get_sleep_length(void
  	return ts->sleep_length;
  }
  
 +static void tick_nohz_restart(struct tick_sched *ts, ktime_t now)
 +{
 +	hrtimer_cancel(&ts->sched_timer);
- 	ts->sched_timer.expires = ts->idle_tick;
++	hrtimer_set_expires(&ts->sched_timer, ts->idle_tick);
 +
 +	while (1) {
 +		/* Forward the time to expire in the future */
 +		hrtimer_forward(&ts->sched_timer, now, tick_period);
 +
 +		if (ts->nohz_mode == NOHZ_MODE_HIGHRES) {
- 			hrtimer_start(&ts->sched_timer,
- 				      ts->sched_timer.expires,
++			hrtimer_start_expires(&ts->sched_timer,
 +				      HRTIMER_MODE_ABS);
 +			/* Check, if the timer was already in the past */
 +			if (hrtimer_active(&ts->sched_timer))
 +				break;
 +		} else {
- 			if (!tick_program_event(ts->sched_timer.expires, 0))
++			if (!tick_program_event(
++				hrtimer_get_expires(&ts->sched_timer), 0))
 +				break;
 +		}
 +		/* Update jiffies and reread time */
 +		tick_do_update_jiffies64(now);
 +		now = ktime_get();
 +	}
 +}
 +
  /**
   * tick_nohz_restart_sched_tick - restart the idle tick from the idle task
   *

linux-next: manual merge of the timers tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1161 bytes --]

Hi all,

Today's linux-next merge of the timers tree got a conflict in
kernel/irq/chip.c between commit 0c5d1eb77a8be917b638344a22afe1398236482b
("genirq: record trigger type") from Linus' tree and commit
f2f61d198649e25e4ddce33f716729eae1aab02b ("generic: sparse irqs: use
irq_desc() together with dyn_array, instead of irq_desc[]") from the
timers tree.

I fixed it up (see below).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc kernel/irq/chip.c
index 5203a59,5a3f73e..0000000
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@@ -126,13 -128,11 +128,12 @@@ int set_irq_type(unsigned int irq, unsi
  		return -ENODEV;
  	}
  
- 	desc = irq_desc + irq;
 -	if (desc->chip->set_type) {
 -		spin_lock_irqsave(&desc->lock, flags);
 -		ret = desc->chip->set_type(irq, type);
 -		spin_unlock_irqrestore(&desc->lock, flags);
 -	}
 +	if (type == IRQ_TYPE_NONE)
 +		return 0;
 +
 +	spin_lock_irqsave(&desc->lock, flags);
 +	ret = __irq_set_trigger(desc, irq, flags);
 +	spin_unlock_irqrestore(&desc->lock, flags);
  	return ret;
  }
  EXPORT_SYMBOL(set_irq_type);

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the timers tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 493 bytes --]

Hi all,

Today's linux-next merge of the timers tree got a conflict in
include/asm-x86/fixmap_64.h between commit
c1a2f4b10852ce68e70f7e4c53600c36cc63ea45 ("x86: change early_ioremap to
use slots instead of nesting") from Linus' tree and commit
1b0ecef5e7803dff3e3e2c86036c53a67e4fe5d2 ("x86-64: reduce boot fixmap
space") from the timers tree.

Just context.  I fixed it up.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the timers tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1055 bytes --]

Hi all,

Today's linux-next merge of the timers tree got a conflict in
drivers/serial/8250.c between commit
b70ac7718579b5cbf3bdd74fd01132d1c91596f4 ("serial: allow 8250 to be used
on sparc") from Linus' tree and commit
d1c115207ad93ecf1140c38c3cef249352433c28 ("serial, 8250: remove NR_IRQ
usage") from the timers tree.

Just overlapping changes. I fixed it up (see below).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/serial/8250.c
index ec39203,356c2a2..0000000
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@@ -3003,15 -3027,11 +3049,15 @@@ static int __init serial8250_init(void
  		goto out;
  
  	platform_device_del(serial8250_isa_devs);
-  put_dev:
+ put_dev:
  	platform_device_put(serial8250_isa_devs);
-  unreg_uart_drv:
+ unreg_uart_drv:
 +#ifdef CONFIG_SPARC
 +	sunserial_unregister_minors(&serial8250_reg, UART_NR);
 +#else
  	uart_unregister_driver(&serial8250_reg);
 +#endif
-  out:
+ out:
  	return ret;
  }
  

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the timers tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the timers tree got a conflict in
drivers/pci/probe.c between commit
4ca8a7726fb0e8094fdb56f2ae2d69fcf9254eae ("PCI: Fix printk warnings in
probe.c") from the pci-current tree and commit
ca81beb4a340ee690803fcb1498f863d0e68843f ("pci: fix BAR print out") from
the timers tree.

Overlapping changes.  I fixed it up (see below) and can carry the fix.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/pci/probe.c
index 8e30dee,477fe9b..0000000
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@@ -383,9 -389,8 +389,9 @@@ void __devinit pci_read_bridge_bases(st
  			res->start = base;
  		if (!res->end)
  			res->end = limit + 0xfff;
- 		printk(KERN_INFO "PCI: bridge %s io port: [%llx, %llx]\n",
+ 		printk(KERN_DEBUG "PCI: bridge %s io port: [%llx, %llx]\n",
 -				 pci_name(dev), res->start, res->end);
 +			pci_name(dev), (unsigned long long) res->start,
 +			(unsigned long long) res->end);
  	}
  
  	res = child->resource[1];
@@@ -397,8 -402,8 +403,8 @@@
  		res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM;
  		res->start = base;
  		res->end = limit + 0xfffff;
- 		printk(KERN_INFO "PCI: bridge %s 32bit mmio: [%llx, %llx]\n", pci_name(dev),
 -		printk(KERN_DEBUG "PCI: bridge %s 32bit mmio: [%llx, %llx]\n",
 -				 pci_name(dev), res->start, res->end);
++		printk(KERN_DEBUG "PCI: bridge %s 32bit mmio: [%llx, %llx]\n", pci_name(dev),
 +			(unsigned long long) res->start, (unsigned long long) res->end);
  	}
  
  	res = child->resource[2];
@@@ -434,9 -439,9 +440,9 @@@
  		res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM | IORESOURCE_PREFETCH;
  		res->start = base;
  		res->end = limit + 0xfffff;
- 		printk(KERN_INFO "PCI: bridge %s %sbit mmio pref: [%llx, %llx]\n",
+ 		printk(KERN_DEBUG "PCI: bridge %s %sbit mmio pref: [%llx, %llx]\n",
 -				 pci_name(dev), (res->flags & PCI_PREF_RANGE_TYPE_64)?"64":"32",
 -				 res->start, res->end);
 +			pci_name(dev), (res->flags & PCI_PREF_RANGE_TYPE_64) ? "64" : "32",
 +			(unsigned long long) res->start, (unsigned long long) res->end);
  	}
  }
  

linux-next: manual merge of the timers tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the timers tree got a conflict in
include/linux/pci_ids.h between commit
ca1af29a733629b9158a4a32a927d16ff9009a95 ("x86, pci: add northbridge pci
ids for fam 0x11 processors") from the x86 tree and commit
021f8b75e78f9da67421a2c2e320e8934a90914a ("x86: add PCI IDs for AMD
Barcelona PCI devices") from the timers tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc include/linux/pci_ids.h
index 58bb4bc,f719d91..0000000
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -497,11 -497,11 +497,16 @@@
  #define PCI_DEVICE_ID_AMD_K8_NB_ADDRMAP	0x1101
  #define PCI_DEVICE_ID_AMD_K8_NB_MEMCTL	0x1102
  #define PCI_DEVICE_ID_AMD_K8_NB_MISC	0x1103
+ #define PCI_DEVICE_ID_AMD_10H_NB_HT	0x1200
+ #define PCI_DEVICE_ID_AMD_10H_NB_MAP	0x1201
+ #define PCI_DEVICE_ID_AMD_10H_NB_DRAM	0x1202
+ #define PCI_DEVICE_ID_AMD_10H_NB_MISC	0x1203
+ #define PCI_DEVICE_ID_AMD_10H_NB_LINK	0x1204
 +#define PCI_DEVICE_ID_AMD_11H_NB_HT	0x1300
 +#define PCI_DEVICE_ID_AMD_11H_NB_MAP	0x1301
 +#define PCI_DEVICE_ID_AMD_11H_NB_DRAM	0x1302
 +#define PCI_DEVICE_ID_AMD_11H_NB_MISC	0x1303
 +#define PCI_DEVICE_ID_AMD_11H_NB_LINK	0x1304
  #define PCI_DEVICE_ID_AMD_LANCE		0x2000
  #define PCI_DEVICE_ID_AMD_LANCE_HOME	0x2001
  #define PCI_DEVICE_ID_AMD_SCSI		0x2020