From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 28 Jun 2013 04:42:11 +0000 (+1000)
Subject: Merge remote-tracking branch 'tip/auto-latest'
X-Git-Tag: next-20130628~36
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fd722bfedd9598383990c6e0f43b5245d111c656;p=karo-tx-linux.git

Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
	arch/arm/kernel/Makefile
	kernel/futex.c
---

fd722bfedd9598383990c6e0f43b5245d111c656
diff --cc arch/arm/kernel/Makefile
index fccfbdb03df1,97cb0576d07c..86d10dd47dc4
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@@ -15,8 -15,8 +15,8 @@@ CFLAGS_REMOVE_return_address.o = -p
  
  # Object file lists.
  
 -obj-y		:= elf.o entry-armv.o entry-common.o irq.o opcodes.o \
 +obj-y		:= elf.o entry-common.o irq.o opcodes.o \
- 		   process.o ptrace.o return_address.o sched_clock.o \
+ 		   process.o ptrace.o return_address.o \
  		   setup.o signal.o stacktrace.o sys_arm.o time.o traps.o
  
  obj-$(CONFIG_ATAGS)		+= atags_parse.o
diff --cc include/linux/ktime.h
index b4fa5e4cd158,fc66b301b648..debf208b7611
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
@@@ -320,17 -321,12 +321,17 @@@ static inline s64 ktime_us_delta(const 
  
  static inline ktime_t ktime_add_us(const ktime_t kt, const u64 usec)
  {
- 	return ktime_add_ns(kt, usec * 1000);
+ 	return ktime_add_ns(kt, usec * NSEC_PER_USEC);
  }
  
 +static inline ktime_t ktime_add_ms(const ktime_t kt, const u64 msec)
 +{
 +	return ktime_add_ns(kt, msec * NSEC_PER_MSEC);
 +}
 +
  static inline ktime_t ktime_sub_us(const ktime_t kt, const u64 usec)
  {
- 	return ktime_sub_ns(kt, usec * 1000);
+ 	return ktime_sub_ns(kt, usec * NSEC_PER_USEC);
  }
  
  extern ktime_t ktime_add_safe(const ktime_t lhs, const ktime_t rhs);