Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-07 20:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
0b981cb94b
linux/arch/s390/kernel
History
Linus Torvalds 0b981cb94b Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 
Pull scheduler changes from Ingo Molnar:
 "Continued quest to clean up and enhance the cputime code by Frederic
  Weisbecker, in preparation for future tickless kernel features.

  Other than that, smallish changes."

Fix up trivial conflicts due to additions next to each other in arch/{x86/}Kconfig

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)
  cputime: Make finegrained irqtime accounting generally available
  cputime: Gather time/stats accounting config options into a single menu
  ia64: Reuse system and user vtime accounting functions on task switch
  ia64: Consolidate user vtime accounting
  vtime: Consolidate system/idle context detection
  cputime: Use a proper subsystem naming for vtime related APIs
  sched: cpu_power: enable ARCH_POWER
  sched/nohz: Clean up select_nohz_load_balancer()
  sched: Fix load avg vs. cpu-hotplug
  sched: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW
  sched: Fix nohz_idle_balance()
  sched: Remove useless code in yield_to()
  sched: Add time unit suffix to sched sysctl knobs
  sched/debug: Limit sd->*_idx range on sysctl
  sched: Remove AFFINE_WAKEUPS feature flag
  s390: Remove leftover account_tick_vtime() header
  cputime: Consolidate vtime handling on context switch
  sched: Move cputime code to its own file
  cputime: Generalize CONFIG_VIRT_CPU_ACCOUNTING
  tile: Remove SD_PREFER_LOCAL leftover
  ...
2012-10-01 10:43:39 -07:00
..
vdso32 s390: add various .gitignore files. 2012-05-16 14:42:41 +02:00
vdso64 s390: add various .gitignore files. 2012-05-16 14:42:41 +02:00
.gitignore s390: add various .gitignore files. 2012-05-16 14:42:41 +02:00
asm-offsets.c s390/vtimer: rework virtual timer interface 2012-07-20 11:15:08 +02:00
audit.c
audit.h
base.S s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
bitmap.c s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
compat_audit.c
compat_exec_domain.c s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
compat_linux.c s390/compat: fix mmap compat system calls 2012-08-08 07:32:57 -07:00
compat_linux.h Mark arguments to certain syscalls as being const 2010-08-13 16:53:13 -07:00
compat_ptrace.h [S390] ptrace cleanup 2011-01-05 12:47:31 +01:00
compat_signal.c s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
compat_wrapper.S s390/compat: fix compat wrappers for process_vm system calls 2012-08-08 07:32:57 -07:00
cpcmd.c s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
crash_dump.c [S390] kernel: Add OS info memory interface 2012-03-11 11:59:29 -04:00
crash.c s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
debug.c s390/debug: remove module_exit function / move EXPORT_SYMBOLs 2012-07-26 10:07:25 +02:00
diag.c [S390] replace diag10() with diag10_range() function 2011-05-10 17:13:43 +02:00
dis.c s390: make use of user_mode() macro where possible 2012-07-30 11:03:12 +02:00
early.c s390/exceptions: sort exception table at build time 2012-07-26 10:07:25 +02:00
ebcdic.c s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
entry64.S s390/vtimer: rework virtual timer interface 2012-07-20 11:15:08 +02:00
entry.h s390/vtimer: rework virtual timer interface 2012-07-20 11:15:08 +02:00
entry.S s390/vtimer: rework virtual timer interface 2012-07-20 11:15:08 +02:00
ftrace.c [S390] cleanup ftrace backend functions 2011-01-05 12:47:31 +01:00
head31.S s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
head64.S s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
head_kdump.S s390/sigp: use sigp order code defines in assembly code 2012-06-05 13:23:36 +02:00
head.S s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
ipl.c s390/ipl: Use diagnose 8 command separation 2012-07-26 10:07:26 +02:00
irq.c s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
jump_label.c s390/jump-label: add arch_jump_label_transform_static() 2011-10-25 11:54:37 -07:00
kprobes.c s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
lgr.c s390/lgr: Add init check to lgr_info_log() 2012-07-20 11:15:01 +02:00
machine_kexec.c s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
Makefile s390: Use generic init_task 2012-05-05 13:00:25 +02:00
mcount64.S s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
mcount.S s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
mem_detect.c [S390] Rework create_mem_hole() function 2011-12-27 11:27:09 +01:00
module.c s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
nmi.c s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
os_info.c s390/smp: make absolute lowcore / cpu restart parameter accesses more robust 2012-06-14 09:09:02 +02:00
perf_cpum_cf.c s390/irq: split irq stats for cpu-measurement alert facilities 2012-05-23 17:06:52 +02:00
perf_event.c [S390] Fix build errors (fallout from system.h disintegration) 2012-03-30 09:41:12 +02:00
process.c s390/vtimer: rework virtual timer interface 2012-07-20 11:15:08 +02:00
processor.c s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
ptrace.c s390/seccomp: add support for system call filtering using BPF 2012-08-08 07:32:56 -07:00
reipl64.S s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
reipl.S s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
relocate_kernel64.S s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
relocate_kernel.S s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
s390_ksyms.c [S390] move sie code to entry.S 2011-07-24 10:48:21 +02:00
sclp.S s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
setup.c s390/hwcaps: do not report high gprs for 31 bit kernel 2012-09-10 09:53:52 +02:00
signal.c s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
smp.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 2012-07-24 09:49:09 -07:00
stacktrace.c s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
suspend.c Disintegrate asm/system.h for S390 2012-03-28 18:30:02 +01:00
swsusp_asm64.S s390/sigp: use sigp order code defines in assembly code 2012-06-05 13:23:36 +02:00
sys_s390.c s390: do not clobber personality flags in sys_32_personality() 2012-08-08 07:32:56 -07:00
syscalls.S [S390] wire up process_vm syscalls 2011-11-14 11:19:08 +01:00
sysinfo.c s390/cpu: remove cpu "capabilities" sysfs attribute 2012-05-30 09:07:30 +02:00
time.c s390/vtimer: rework virtual timer interface 2012-07-20 11:15:08 +02:00
topology.c s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
traps.c s390: make use of user_mode() macro where possible 2012-07-30 11:03:12 +02:00
vdso.c s390/mm: rename user_mode variable to addressing_mode 2012-07-30 11:03:11 +02:00
vmlinux.lds.S s390/linker script: use RO_DATA_SECTION 2012-07-26 10:07:25 +02:00
vtime.c cputime: Use a proper subsystem naming for vtime related APIs 2012-09-25 15:31:31 +02:00