From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Jan 2014 18:42:08 +0000 (-0800)
Subject: Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: Ubuntu-5.13.0-19.19~20825
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a0fa1dd3cdbccec9597fe53b6177a9aa6e20f2f8;p=mirror_ubuntu-jammy-kernel.git

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

Pull scheduler changes from Ingo Molnar:

 - Add the initial implementation of SCHED_DEADLINE support: a real-time
   scheduling policy where tasks that meet their deadlines and
   periodically execute their instances in less than their runtime quota
   see real-time scheduling and won't miss any of their deadlines.
   Tasks that go over their quota get delayed (Available to privileged
   users for now)

 - Clean up and fix preempt_enable_no_resched() abuse all around the
   tree

 - Do sched_clock() performance optimizations on x86 and elsewhere

 - Fix and improve auto-NUMA balancing

 - Fix and clean up the idle loop

 - Apply various cleanups and fixes

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (60 commits)
  sched: Fix __sched_setscheduler() nice test
  sched: Move SCHED_RESET_ON_FORK into attr::sched_flags
  sched: Fix up attr::sched_priority warning
  sched: Fix up scheduler syscall LTP fails
  sched: Preserve the nice level over sched_setscheduler() and sched_setparam() calls
  sched/core: Fix htmldocs warnings
  sched/deadline: No need to check p if dl_se is valid
  sched/deadline: Remove unused variables
  sched/deadline: Fix sparse static warnings
  m68k: Fix build warning in mac_via.h
  sched, thermal: Clean up preempt_enable_no_resched() abuse
  sched, net: Fixup busy_loop_us_clock()
  sched, net: Clean up preempt_enable_no_resched() abuse
  sched/preempt: Fix up missed PREEMPT_NEED_RESCHED folding
  sched/preempt, locking: Rework local_bh_{dis,en}able()
  sched/clock, x86: Avoid a runtime condition in native_sched_clock()
  sched/clock: Fix up clear_sched_clock_stable()
  sched/clock, x86: Use a static_key for sched_clock_stable
  sched/clock: Remove local_irq_disable() from the clocks
  sched/clock, x86: Rewrite cyc2ns() to avoid the need to disable IRQs
  ...
---

a0fa1dd3cdbccec9597fe53b6177a9aa6e20f2f8
diff --cc kernel/softirq.c
index 9a4500e4c189,9e368ef35f9a..8b93b3770f85
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@@ -264,8 -207,8 +241,8 @@@ asmlinkage void __do_softirq(void
  	pending = local_softirq_pending();
  	account_irq_enter_time(current);
  
- 	__local_bh_disable(_RET_IP_, SOFTIRQ_OFFSET);
+ 	__local_bh_disable_ip(_RET_IP_, SOFTIRQ_OFFSET);
 -	lockdep_softirq_enter();
 +	in_hardirq = lockdep_softirq_start();
  
  	cpu = smp_processor_id();
  restart: