manual merge of sched/core

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/include/asm/Kbuild
index 59ceae8f3c959616851a21ba3f08ae18941146ca,4e6838d4ddf6d6b30278e3d1feb255339b7ecb33..1a7024b413511d6742f6fb928407603c648c77e3
--- 1/arch/arm/include/asm/Kbuild
--- 2/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@@ -31,4 -31,6 +31,5 @@@ generic-y += termbits.
  generic-y += termios.h
  generic-y += timex.h
  generic-y += trace_clock.h
 -generic-y += types.h
  generic-y += unaligned.h
+ generic-y += preempt.h

diff --cc arch/x86/kernel/entry_64.S
Simple merge

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

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

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

diff --cc kernel/rcu/tree.c
Simple merge

diff --cc kernel/softirq.c
index dacd0ab51df4b782815dd61326f4e8512e25ddf2,dcab1d3fb53d284cc42da1e36c6e5d001cd5baa9..b24988353458c8cad2fff6aed7853f8625f1cf36
--- 1/kernel/softirq.c
--- 2/kernel/softirq.c
+++ b/kernel/softirq.c
@@@ -168,17 -169,12 +168,17 @@@ static inline void _local_bh_enable_ip(
         * Keep preemption disabled until we are done with
         * softirq processing:
         */
-       sub_preempt_count(SOFTIRQ_DISABLE_OFFSET - 1);
+       preempt_count_sub(SOFTIRQ_DISABLE_OFFSET - 1);
  
 -      if (unlikely(!in_interrupt() && local_softirq_pending()))
 +      if (unlikely(!in_interrupt() && local_softirq_pending())) {
 +              /*
 +               * Run softirq if any pending. And do it in its own stack
 +               * as we may be calling this deep in a task call stack already.
 +               */
                do_softirq();
 +      }
  
-       dec_preempt_count();
+       preempt_count_dec();
  #ifdef CONFIG_TRACE_IRQFLAGS
        local_irq_enable();
  #endif

diff --cc kernel/sysctl.c
Simple merge

diff --cc mm/huge_memory.c
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc mm/migrate.c
Simple merge

diff --cc mm/mprotect.c
index a3af058f68e4d9f434337d0dcd6127d5d8c6d039,a0302ac0be985393256a99070becec949f92ae46..a597f2ffcd6fc873a5f5b9779e4e79ac022bb2fe
--- 1/mm/mprotect.c
--- 2/mm/mprotect.c
+++ b/mm/mprotect.c
@@@ -100,12 -89,11 +90,13 @@@ static unsigned long change_pte_range(s
                                 * just be safe and disable write
                                 */
                                make_migration_entry_read(&entry);
 -                              set_pte_at(mm, addr, pte,
 -                                      swp_entry_to_pte(entry));
 +                              newpte = swp_entry_to_pte(entry);
 +                              if (pte_swp_soft_dirty(oldpte))
 +                                      newpte = pte_swp_mksoft_dirty(newpte);
 +                              set_pte_at(mm, addr, pte, newpte);
+ 
+                               pages++;
                        }
-                       pages++;
                }
        } while (pte++, addr += PAGE_SIZE, addr != end);
        arch_leave_lazy_mmu_mode();