Commit 21670ee4 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

posix-timers: Cleanup the flag/flags confusion 



do_timer_settime() has a 'flags' argument and uses 'flag' for the interrupt
flags, which is confusing at best.

Rename the argument so 'flags' can be used for interrupt flags as usual.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20190730223828.782664411@linutronix.de
parent c7e6d704

kernel/time/posix-timers.c

+5 −5
Original line number Diff line number Diff line
@@ -844,13 +844,13 @@ int common_timer_set(struct k_itimer *timr, int flags, 
	return 0;

}



static int do_timer_settime(timer_t timer_id, int flags,

static int do_timer_settime(timer_t timer_id, int tmr_flags,

			    struct itimerspec64 *new_spec64,

			    struct itimerspec64 *old_spec64)

{

	const struct k_clock *kc;

	struct k_itimer *timr;

	unsigned long flag;

	unsigned long flags;

	int error = 0;



	if (!timespec64_valid(&new_spec64->it_interval) ||
@@ -860,7 +860,7 @@ static int do_timer_settime(timer_t timer_id, int flags, 
	if (old_spec64)

		memset(old_spec64, 0, sizeof(*old_spec64));

retry:

	timr = lock_timer(timer_id, &flag);

	timr = lock_timer(timer_id, &flags);

	if (!timr)

		return -EINVAL;
@@ -868,9 +868,9 @@ retry: 
	if (WARN_ON_ONCE(!kc || !kc->timer_set))

		error = -EINVAL;

	else

		error = kc->timer_set(timr, flags, new_spec64, old_spec64);

		error = kc->timer_set(timr, tmr_flags, new_spec64, old_spec64);



	unlock_timer(timr, flag);

	unlock_timer(timr, flags);

	if (error == TIMER_RETRY) {

		old_spec64 = NULL;	// We already got the old time...

		goto retry;

CRA Git | Maintained and supported by SUSTech CRA and CCSE