summaryrefslogtreecommitdiffstats
path: root/arch/s390/include
diff options
context:
space:
mode:
authorIngo Molnar2012-12-08 15:44:43 +0100
committerIngo Molnar2012-12-08 15:44:43 +0100
commit38130ec08716ae2ece8060eca01607b58da7258c (patch)
tree71d0cd76ccfb2b960ddb6b820850269265389052 /arch/s390/include
parentMerge tag 'cputime-adjustment-cleanups' of git://git.kernel.org/pub/scm/linux... (diff)
parentvtime: Warn if irqs aren't disabled on system time accounting APIs (diff)
downloadkernel-qcow2-linux-38130ec08716ae2ece8060eca01607b58da7258c.tar.gz
kernel-qcow2-linux-38130ec08716ae2ece8060eca01607b58da7258c.tar.xz
kernel-qcow2-linux-38130ec08716ae2ece8060eca01607b58da7258c.zip
Merge tag 'sched-cputime-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into sched/core
Pull more cputime cleanups from Frederic Weisbecker: * Get rid of underscores polluting the vtime namespace * Consolidate context switch and tick handling * Improve debuggability by detecting irq unsafe callers Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/s390/include')
-rw-r--r--arch/s390/include/asm/cputime.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/include/asm/cputime.h b/arch/s390/include/asm/cputime.h
index 023d5ae24482..d2ff41370c0c 100644
--- a/arch/s390/include/asm/cputime.h
+++ b/arch/s390/include/asm/cputime.h
@@ -14,6 +14,7 @@
#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. */