Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux...

Conflicts:
	arch/x86/kernel/io_apic.c
	kernel/rcuclassic.c
	kernel/sched.c
	kernel/time/tick-sched.c

Signed-off-by: Mike Travis <travis@sgi.com>
[ mingo@elte.hu: backmerged typo fix for io_apic.c ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc arch/ia64/include/asm/topology.h
Simple merge

diff --cc arch/mips/include/asm/mach-ip27/topology.h
Simple merge

diff --cc arch/powerpc/include/asm/topology.h
index 373fca3,236dae1..3752585
--- 1/arch/powerpc/include/asm/topology.h
--- 2/arch/powerpc/include/asm/topology.h
+++ b/arch/powerpc/include/asm/topology.h
@@@ -46,8 -46,13 +46,12 @@@ static inline int pcibus_to_node(struc
                                        node_to_cpumask(pcibus_to_node(bus)) \
                                )
  
+ #define cpumask_of_pcibus(bus)        (pcibus_to_node(bus) == -1 ?            \
+                                cpu_all_mask :                         \
+                                cpumask_of_node(pcibus_to_node(bus)))
+ 
  /* sched_domains SD_NODE_INIT for PPC64 machines */
  #define SD_NODE_INIT (struct sched_domain) {          \
 -      .span                   = CPU_MASK_NONE,        \
        .parent                 = NULL,                 \
        .child                  = NULL,                 \
        .groups                 = NULL,                 \

diff --cc arch/sh/include/asm/topology.h
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/irq.h
index 4bb732e,28e409f..592688e
--- 1/arch/x86/include/asm/irq.h
--- 2/arch/x86/include/asm/irq.h
+++ b/arch/x86/include/asm/irq.h
@@@ -31,13 -31,9 +31,9 @@@ static inline int irq_canonicalize(int 
  # endif
  #endif
  
- #ifdef CONFIG_IRQBALANCE
- extern int irqbalance_disable(char *str);
- #endif
- 
  #ifdef CONFIG_HOTPLUG_CPU
  #include <linux/cpumask.h>
 -extern void fixup_irqs(cpumask_t map);
 +extern void fixup_irqs(void);
  #endif
  
  extern unsigned int do_IRQ(struct pt_regs *regs);

diff --cc arch/x86/include/asm/topology.h
Simple merge

diff --cc arch/x86/kernel/apic.c
Simple merge

diff --cc arch/x86/kernel/cpu/intel_cacheinfo.c
Simple merge

diff --cc arch/x86/kernel/cpu/mcheck/mce_amd_64.c
Simple merge

diff --cc arch/x86/kernel/genx2apic_uv_x.c
Simple merge

diff --cc arch/x86/kernel/io_apic.c
Simple merge

diff --cc arch/x86/kernel/irq_64.c
Simple merge

diff --cc arch/x86/kernel/irqinit_32.c
Simple merge

diff --cc arch/x86/kernel/irqinit_64.c
Simple merge

diff --cc arch/x86/kernel/setup_percpu.c
Simple merge

diff --cc arch/x86/kernel/smp.c
Simple merge

diff --cc arch/x86/kernel/smpboot.c
Simple merge

diff --cc arch/x86/kernel/tlb_32.c
Simple merge

diff --cc arch/x86/kernel/tlb_64.c
Simple merge

diff --cc arch/x86/kernel/traps.c
Simple merge

diff --cc arch/x86/xen/mmu.c
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/rcuclassic.c
Simple merge

diff --cc kernel/sched.c
index 756d981,f209566..27ba1d6
--- 1/kernel/sched.c
--- 2/kernel/sched.c
+++ b/kernel/sched.c
@@@ -5477,17 -5426,8 +5495,16 @@@ long sched_setaffinity(pid_t pid, cons
        get_task_struct(p);
        read_unlock(&tasklist_lock);
  
 +      if (!alloc_cpumask_var(&cpus_allowed, GFP_KERNEL)) {
 +              retval = -ENOMEM;
 +              goto out_put_task;
 +      }
 +      if (!alloc_cpumask_var(&new_mask, GFP_KERNEL)) {
 +              retval = -ENOMEM;
 +              goto out_free_cpus_allowed;
 +      }
        retval = -EPERM;
-       if ((current->euid != p->euid) && (current->euid != p->uid) &&
-                       !capable(CAP_SYS_NICE))
+       if (!check_same_owner(p) && !capable(CAP_SYS_NICE))
                goto out_unlock;
  
        retval = security_task_setscheduler(p, 0, NULL);

diff --cc kernel/sched_fair.c
Simple merge

diff --cc kernel/sched_rt.c
Simple merge

diff --cc kernel/sched_stats.h
Simple merge

diff --cc kernel/time/tick-sched.c
index 70f872c,8f3fc25..76a574b
--- 1/kernel/time/tick-sched.c
--- 2/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