Commit 45f37e86 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched 

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
  latencytop: Change Kconfig dependency.
  futex: Add bitset conditional wait/wakeup functionality
  futex: Remove warn on in return fixup path
  x86: replace LOCK_PREFIX in futex.h
  tick-sched: add more debug information
  timekeeping: update xtime_cache when time(zone) changes
  hrtimer: fix hrtimer_init_sleeper() users
parents e30ec452 aa7d9350

arch/x86/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ config LOCKDEP_SUPPORT 
config STACKTRACE_SUPPORT

	def_bool y



config HAVE_LATENCYTOP_SUPPORT

	def_bool y



config SEMAPHORE_SLEEPERS

	def_bool y

include/asm-x86/futex.h

+3 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
"1:	movl	%2, %0\n					\

	movl	%0, %3\n"					\

	insn "\n"						\

"2:	" LOCK_PREFIX "cmpxchgl %3, %2\n			\

"2:	lock; cmpxchgl %3, %2\n					\

	jnz	1b\n						\

3:	.section .fixup,\"ax\"\n				\

4:	mov	%5, %1\n					\
@@ -72,7 +72,7 @@ futex_atomic_op_inuser(int encoded_op, int __user *uaddr) 
		__futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);

		break;

	case FUTEX_OP_ADD:

		__futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,

		__futex_atomic_op1("lock; xaddl %0, %2", ret, oldval,

				   uaddr, oparg);

		break;

	case FUTEX_OP_OR:
@@ -111,8 +111,8 @@ futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval) 
		return -EFAULT;



	__asm__ __volatile__(

		"1:	" LOCK_PREFIX "cmpxchgl %3, %1		\n"



		"1:	lock; cmpxchgl %3, %1			\n"

		"2:	.section .fixup, \"ax\"			\n"

		"3:	mov     %2, %0				\n"

		"	jmp     2b				\n"

include/linux/futex.h

+10 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ union ktime; 
#define FUTEX_LOCK_PI		6

#define FUTEX_UNLOCK_PI		7

#define FUTEX_TRYLOCK_PI	8

#define FUTEX_WAIT_BITSET	9

#define FUTEX_WAKE_BITSET	10



#define FUTEX_PRIVATE_FLAG	128

#define FUTEX_CMD_MASK		~FUTEX_PRIVATE_FLAG
@@ -33,6 +35,8 @@ union ktime; 
#define FUTEX_LOCK_PI_PRIVATE	(FUTEX_LOCK_PI | FUTEX_PRIVATE_FLAG)

#define FUTEX_UNLOCK_PI_PRIVATE	(FUTEX_UNLOCK_PI | FUTEX_PRIVATE_FLAG)

#define FUTEX_TRYLOCK_PI_PRIVATE (FUTEX_TRYLOCK_PI | FUTEX_PRIVATE_FLAG)

#define FUTEX_WAIT_BITSET_PRIVATE	(FUTEX_WAIT_BITS | FUTEX_PRIVATE_FLAG)

#define FUTEX_WAKE_BITSET_PRIVATE	(FUTEX_WAKE_BITS | FUTEX_PRIVATE_FLAG)



/*

 * Support for robust futexes: the kernel cleans up held futexes at
@@ -111,6 +115,12 @@ struct robust_list_head { 
 */

#define ROBUST_LIST_LIMIT	2048



/*

 * bitset with all bits set for the FUTEX_xxx_BITSET OPs to request a

 * match of any bit.

 */

#define FUTEX_BITSET_MATCH_ANY	0xffffffff



#ifdef __KERNEL__

long do_futex(u32 __user *uaddr, int op, u32 val, union ktime *timeout,

	      u32 __user *uaddr2, u32 val2, u32 val3);

include/linux/thread_info.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ struct restart_block { 
			u32 *uaddr;

			u32 val;

			u32 flags;

			u32 bitset;

			u64 time;

		} futex;

	};

include/linux/tick.h

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ enum tick_nohz_mode { 
 * @idle_calls:		Total number of idle calls

 * @idle_sleeps:	Number of idle calls, where the sched tick was stopped

 * @idle_entrytime:	Time when the idle call was entered

 * @idle_waketime:	Time when the idle was interrupted

 * @idle_exittime:	Time when the idle state was left

 * @idle_sleeptime:	Sum of the time slept in idle with sched tick stopped

 * @sleep_length:	Duration of the current idle sleep

 */
@@ -53,6 +55,8 @@ struct tick_sched { 
	unsigned long			idle_sleeps;

	int				idle_active;

	ktime_t				idle_entrytime;

	ktime_t				idle_waketime;

	ktime_t				idle_exittime;

	ktime_t				idle_sleeptime;

	ktime_t				idle_lastupdate;

	ktime_t				sleep_length;

CRA Git | Maintained and supported by SUSTech CRA and CCSE