linux/arch/cris/arch-v32/kernel
Linus Torvalds 420c1c572d Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (62 commits)
  posix-clocks: Check write permissions in posix syscalls
  hrtimer: Remove empty hrtimer_init_hres_timer()
  hrtimer: Update hrtimer->state documentation
  hrtimer: Update base[CLOCK_BOOTTIME].offset correctly
  timers: Export CLOCK_BOOTTIME via the posix timers interface
  timers: Add CLOCK_BOOTTIME hrtimer base
  time: Extend get_xtime_and_monotonic_offset() to also return sleep
  time: Introduce get_monotonic_boottime and ktime_get_boottime
  hrtimers: extend hrtimer base code to handle more then 2 clockids
  ntp: Remove redundant and incorrect parameter check
  mn10300: Switch do_timer() to xtimer_update()
  posix clocks: Introduce dynamic clocks
  posix-timers: Cleanup namespace
  posix-timers: Add support for fd based clocks
  x86: Add clock_adjtime for x86
  posix-timers: Introduce a syscall for clock tuning.
  time: Splitout compat timex accessors
  ntp: Add ADJ_SETOFFSET mode bit
  time: Introduce timekeeping_inject_offset
  posix-timer: Update comment
  ...

Fix up new system-call-related conflicts in
	arch/x86/ia32/ia32entry.S
	arch/x86/include/asm/unistd_32.h
	arch/x86/include/asm/unistd_64.h
	arch/x86/kernel/syscall_table_32.S
(name_to_handle_at()/open_by_handle_at() vs clock_adjtime()), and some
due to movement of get_jiffies_64() in:
	kernel/time.c
2011-03-15 18:53:35 -07:00
..
cache.c [CRIS] Move header files from include to arch/cris/include. 2008-10-29 17:29:44 +01:00
cacheflush.S CRIS: Add debug for assembler functions 2010-08-04 12:59:43 +02:00
crisksyms.c CRIS: Don't use mask_irq as symbol name 2010-05-25 17:48:14 +02:00
debugport.c [CRIS] Move header files from include to arch/cris/include. 2008-10-29 17:29:44 +01:00
entry.S CRIS: Faster syscall entry for CRISv32. 2010-08-04 13:00:09 +02:00
fasttimer.c
head.S CRIS: v32: Correct address for romfs in the image 2010-08-04 13:00:30 +02:00
irq.c cris: Convert V32 interrupt handling 2011-01-21 11:55:25 +01:00
kgdb_asm.S CRIS: v32: Correct path for intr_vect.h 2010-08-04 13:00:53 +02:00
kgdb.c CRIS: kgdb: Fix compilation errors 2010-08-04 13:01:12 +02:00
Makefile CRISv32: Remove obsolete vcs_hook.o from Makefile 2009-04-21 13:10:33 +02:00
process.c Make do_execve() take a const filename pointer 2010-08-17 18:07:43 -07:00
ptrace.c ptrace: cleanup arch_ptrace() on cris 2010-10-27 18:03:10 -07:00
setup.c CRIS: More ARTPEC-3 support and i2c-boardinfo. 2010-08-04 13:01:50 +02:00
signal.c CRIS: v32: Correct auto-restart of syscalls 2010-08-04 13:02:01 +02:00
smp.c cris: Replace deprecated spinlock initialization 2011-01-27 12:30:36 +01:00
time.c cris: arch-v32: Switch do_timer() to xtime_update() 2011-01-31 14:55:44 +01:00
traps.c CRIS: Minor formatting fix in traps.c 2010-08-04 13:02:15 +02:00