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

Commit 6832d965 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull timers/nohz changes from Ingo Molnar:
 "It mostly contains fixes and full dynticks off-case optimizations, by
  Frederic Weisbecker"

* 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)
  nohz: Include local CPU in full dynticks global kick
  nohz: Optimize full dynticks's sched hooks with static keys
  nohz: Optimize full dynticks state checks with static keys
  nohz: Rename a few state variables
  vtime: Always debug check snapshot source _before_ updating it
  vtime: Always scale generic vtime accounting results
  vtime: Optimize full dynticks accounting off case with static keys
  vtime: Describe overriden functions in dedicated arch headers
  m68k: hardirq_count() only need preempt_mask.h
  hardirq: Split preempt count mask definitions
  context_tracking: Split low level state headers
  vtime: Fix racy cputime delta update
  vtime: Remove a few unneeded generic vtime state checks
  context_tracking: User/kernel broundary cross trace events
  context_tracking: Optimize context switch off case with static keys
  context_tracking: Optimize guest APIs off case with static key
  context_tracking: Optimize main APIs off case with static key
  context_tracking: Ground setup for static key use
  context_tracking: Remove full dynticks' hacky dependency on wide context tracking
  nohz: Only enable context tracking on full dynticks CPUs
  ...
parents 228abe73 c2e7fcf5

arch/ia64/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ generic-y += clkdev.h 
generic-y += exec.h

generic-y += kvm_para.h

generic-y += trace_clock.h

generic-y += vtime.h
 
 No newline at end of file

arch/m68k/include/asm/irqflags.h

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


#include <linux/types.h>

#ifdef CONFIG_MMU

#include <linux/hardirq.h>

#include <linux/preempt_mask.h>

#endif

#include <linux/preempt.h>

#include <asm/thread_info.h>

arch/powerpc/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ 
generic-y += clkdev.h

generic-y += rwsem.h

generic-y += trace_clock.h

generic-y += vtime.h
 
 No newline at end of file

arch/s390/include/asm/cputime.h

+0 −3
Original line number Diff line number Diff line
@@ -13,9 +13,6 @@ 
#include <asm/div64.h>





#define __ARCH_HAS_VTIME_ACCOUNT

#define __ARCH_HAS_VTIME_TASK_SWITCH



/* We want to use full resolution of the CPU timer: 2**-12 micro-seconds. */



typedef unsigned long long __nocast cputime_t;

arch/s390/include/asm/vtime.h

0 → 100644
+7 −0
Original line number Diff line number Diff line 
#ifndef _S390_VTIME_H

#define _S390_VTIME_H



#define __ARCH_HAS_VTIME_ACCOUNT

#define __ARCH_HAS_VTIME_TASK_SWITCH



#endif /* _S390_VTIME_H */