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

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

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
  ...
parents 9326657a eaad4513

Documentation/sysctl/kernel.txt

+0 −5
Original line number Diff line number Diff line
@@ -428,11 +428,6 @@ rate for each task. 
numa_balancing_scan_size_mb is how many megabytes worth of pages are

scanned for a given scan.



numa_balancing_settle_count is how many scan periods must complete before

the schedule balancer stops pushing the task towards a preferred node. This

gives the scheduler a chance to place the task on an alternative node if the

preferred node is overloaded.



numa_balancing_migrate_deferred is how many page migrations get skipped

unconditionally, after a page migration is skipped because a page is shared

with other tasks. This reduces page migration overhead, and determines

arch/arm/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


#include <uapi/asm/unistd.h>



#define __NR_syscalls  (380)

#define __NR_syscalls  (384)

#define __ARM_NR_cmpxchg		(__ARM_NR_BASE+0x00fff0)



#define __ARCH_WANT_STAT64

arch/arm/include/uapi/asm/unistd.h

+2 −0
Original line number Diff line number Diff line
@@ -406,6 +406,8 @@ 
#define __NR_process_vm_writev		(__NR_SYSCALL_BASE+377)

#define __NR_kcmp			(__NR_SYSCALL_BASE+378)

#define __NR_finit_module		(__NR_SYSCALL_BASE+379)

#define __NR_sched_setattr		(__NR_SYSCALL_BASE+380)

#define __NR_sched_getattr		(__NR_SYSCALL_BASE+381)



/*

 * This may need to be greater than __NR_last_syscall+1 in order to

arch/arm/kernel/calls.S

+2 −0
Original line number Diff line number Diff line
@@ -389,6 +389,8 @@ 
		CALL(sys_process_vm_writev)

		CALL(sys_kcmp)

		CALL(sys_finit_module)

/* 380 */	CALL(sys_sched_setattr)

		CALL(sys_sched_getattr)

#ifndef syscalls_counted

.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls

#define syscalls_counted

arch/m68k/include/asm/mac_via.h

+2 −0
Original line number Diff line number Diff line
@@ -254,6 +254,8 @@ 
extern volatile __u8 *via1,*via2;

extern int rbv_present,via_alt_mapping;



struct irq_desc;



extern void via_register_interrupts(void);

extern void via_irq_enable(int);

extern void via_irq_disable(int);