kernel-fxtec-pro1x/arch/ia64/xen
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
..
gate-data.S Rename .data.gate to .data..gate. 2010-03-03 11:25:59 +01:00
grant-table.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
hypercall.S [IA64] Remove COMPAT_IA32 support 2010-02-08 10:42:17 -08:00
hypervisor.c ia64/pv_ops/xen: define xen pv_init_ops for various xen initialization. 2008-10-17 10:02:52 -07:00
irq_xen.c percpu: make percpu symbols in xen unique 2009-10-29 22:34:13 +09:00
irq_xen.h ia64/pv_ops/xen: implement xen pv_irq_ops. 2008-10-17 10:07:33 -07:00
Kconfig [IA64] fixes configs and add default config for ia64 xen domU 2009-02-19 11:39:06 -08:00
machvec.c ia64/xen: define xen machine vector for domU. 2008-10-17 10:08:56 -07:00
Makefile ia64/pv_ops/xen/gate.S: xen gate page paravirtualization 2009-03-26 11:01:55 -07:00
suspend.c xen: suspend: add "arch" to pre/post suspend hooks 2011-02-25 16:43:12 +00:00
time.c ia64: Switch do_timer() to xtime_update() 2011-01-31 14:55:45 +01:00
time.h ia64/xen: preliminary support for save/restore. 2008-10-17 10:09:25 -07:00
xcom_hcall.c ia64/xen: xencomm conversion functions for hypercalls 2008-10-17 10:00:19 -07:00
xen_pv_ops.c [IA64] xen: use ARRAY_SIZE macro in xen_pv_ops.c 2010-09-23 14:26:30 -07:00
xencomm.c ia64/xen: xencomm conversion functions for hypercalls 2008-10-17 10:00:19 -07:00
xenivt.S ia64/pv_ops/xen: paravirtualize ivt.S for xen. 2008-10-17 10:05:08 -07:00
xensetup.S Rename .data.read_mostly to .data..read_mostly. 2010-03-03 11:26:00 +01:00