OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
b62ad9ab18
linux/arch/s390/kernel
History
Linus Torvalds b62ad9ab18 Merge branch 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 
* 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  um: Fix read_persistent_clock fallout
  kgdb: Do not access xtime directly
  powerpc: Clean up obsolete code relating to decrementer and timebase
  powerpc: Rework VDSO gettimeofday to prevent time going backwards
  clocksource: Add __clocksource_updatefreq_hz/khz methods
  x86: Convert common clocksources to use clocksource_register_hz/khz
  timekeeping: Make xtime and wall_to_monotonic static
  hrtimer: Cleanup direct access to wall_to_monotonic
  um: Convert to use read_persistent_clock
  timkeeping: Fix update_vsyscall to provide wall_to_monotonic offset
  powerpc: Cleanup xtime usage
  powerpc: Simplify update_vsyscall
  time: Kill off CONFIG_GENERIC_TIME
  time: Implement timespec_add
  x86: Fix vtime/file timestamp inconsistencies

Trivial conflicts in Documentation/feature-removal-schedule.txt

Much less trivial conflicts in arch/powerpc/kernel/time.c resolved as
per Thomas' earlier merge commit 47916be4e2 ("Merge branch
'powerpc.cherry-picks' into timers/clocksource")
2010-08-06 13:18:29 -07:00
..
vdso32 [S390] vdso: use ntp adjusted clock multiplier 2010-04-22 17:17:19 +02:00
vdso64 [S390] vdso: use ntp adjusted clock multiplier 2010-04-22 17:17:19 +02:00
asm-offsets.c [S390] spp: fix compilation for CONFIG_32BIT 2010-05-26 23:26:29 +02:00
audit.c
audit.h
base.S [S390] Cleanup struct _lowcore usage and defines. 2010-02-26 22:37:31 +01:00
bitmap.c
compat_audit.c
compat_exec_domain.c
compat_linux.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
compat_linux.h Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 2009-12-09 19:01:47 -08:00
compat_ptrace.h
compat_signal.c [S390] 64-bit register support for 31-bit processes 2009-10-06 10:35:10 +02:00
compat_wrapper.S improve sys_newuname() for compat architectures 2010-03-12 15:52:32 -08:00
cpcmd.c
crash.c
debug.c [S390] avoid default_llseek in s390 drivers 2010-05-17 10:00:16 +02:00
diag.c
dis.c [S390] add z9-ec/z10 instruction to kernel disassembler 2010-02-26 22:37:32 +01:00
early.c [S390] virtualization aware cpu measurement 2010-05-17 10:00:15 +02:00
ebcdic.c
entry64.S [S390] Fix IRQ tracing in case of PER 2010-07-27 19:29:42 +02:00
entry.h improve sys_newuname() for compat architectures 2010-03-12 15:52:32 -08:00
entry.S [S390] Fix IRQ tracing in case of PER 2010-07-27 19:29:42 +02:00
ftrace.c Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2010-02-28 10:17:55 -08:00
head31.S [S390] correct address of _stext with CONFIG_SHARED_KERNEL=y 2010-05-12 09:32:26 +02:00
head64.S [S390] correct address of _stext with CONFIG_SHARED_KERNEL=y 2010-05-12 09:32:26 +02:00
head.S [S390] More cleanup for struct _lowcore 2010-05-17 10:00:15 +02:00
init_task.c Use new __init_task_data macro in arch init_task.c files. 2009-09-21 06:27:08 +02:00
ipl.c sysfs: add struct file* to bin_attr callbacks 2010-05-21 09:37:31 -07:00
irq.c
kprobes.c [S390] kprobes: forbid probing of stnsm/stosm/epsw 2010-05-26 23:26:29 +02:00
machine_kexec.c [S390] smp: always reboot on cpu 0 2010-02-26 22:37:30 +01:00
Makefile [S390] add support for compressed kernels 2010-02-26 22:37:33 +01:00
mcount64.S [S390] improve mcount code 2009-09-11 10:29:43 +02:00
mcount.S [S390] improve mcount code 2009-09-11 10:29:43 +02:00
mem_detect.c [S390] s390: hibernation support for s390 2009-06-16 10:31:22 +02:00
module.c [S390] kprobes: add parameter check to module_free() 2010-06-08 18:58:23 +02:00
nmi.c [S390] idle time accounting vs. machine checks 2010-05-17 10:00:15 +02:00
process.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
processor.c [S390] More cleanup for struct _lowcore 2010-05-17 10:00:15 +02:00
ptrace.c [S390] add breaking event address for user space 2010-05-17 10:00:15 +02:00
reipl64.S [S390] Cleanup struct _lowcore usage and defines. 2010-02-26 22:37:31 +01:00
reipl.S [S390] Cleanup struct _lowcore usage and defines. 2010-02-26 22:37:31 +01:00
relocate_kernel64.S
relocate_kernel.S
s390_ext.c [S390] idle time accounting vs. machine checks 2010-05-17 10:00:15 +02:00
s390_ksyms.c
sclp.S Merge branch 'for-next' into for-linus 2010-03-08 16:55:37 +01:00
setup.c [S390] spp: fix compilation for CONFIG_32BIT 2010-05-26 23:26:29 +02:00
signal.c [S390] add breaking event address for user space 2010-05-17 10:00:15 +02:00
smp.c s390: convert cpu notifier to return encapsulate errno value 2010-05-27 09:12:48 -07:00
stacktrace.c
suspend.c [S390] hibernate: make sure pfn_is_nosave handles lowcore pages 2009-09-22 22:58:45 +02:00
switch_cpu64.S [S390] Cleanup struct _lowcore usage and defines. 2010-02-26 22:37:31 +01:00
switch_cpu.S [S390] Cleanup struct _lowcore usage and defines. 2010-02-26 22:37:31 +01:00
swsusp_asm64.S Merge branch 'for-35' of git://repo.or.cz/linux-kbuild 2010-06-01 08:55:52 -07:00
sys_s390.c improve sys_newuname() for compat architectures 2010-03-12 15:52:32 -08:00
syscalls.S improve sys_newuname() for compat architectures 2010-03-12 15:52:32 -08:00
sysinfo.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
time.c Merge branch 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2010-08-06 13:18:29 -07:00
topology.c [S390] topology: expose core identifier 2010-05-17 10:00:16 +02:00
traps.c [S390] debug: enable exception-trace debug facility 2010-05-17 10:00:17 +02:00
vdso.c [S390] vdso: remove redundant check for CONFIG_64BIT 2010-05-17 10:00:16 +02:00
vmlinux.lds.S [S390] Enable kmemleak on s390. 2009-10-06 10:35:06 +02:00
vtime.c [S390] idle time accounting vs. machine checks 2010-05-17 10:00:15 +02:00