@@ -309,10 +309,10 @@ int posix_timer_event(struct k_itimer *timr, int si_private)
309
309
*/
310
310
static enum hrtimer_restart posix_timer_fn (struct hrtimer * timer )
311
311
{
312
+ enum hrtimer_restart ret = HRTIMER_NORESTART ;
312
313
struct k_itimer * timr ;
313
314
unsigned long flags ;
314
315
int si_private = 0 ;
315
- enum hrtimer_restart ret = HRTIMER_NORESTART ;
316
316
317
317
timr = container_of (timer , struct k_itimer , it .real .timer );
318
318
spin_lock_irqsave (& timr -> it_lock , flags );
@@ -400,8 +400,8 @@ static struct pid *good_sigevent(sigevent_t * event)
400
400
401
401
static struct k_itimer * alloc_posix_timer (void )
402
402
{
403
- struct k_itimer * tmr ;
404
- tmr = kmem_cache_zalloc ( posix_timers_cache , GFP_KERNEL );
403
+ struct k_itimer * tmr = kmem_cache_zalloc ( posix_timers_cache , GFP_KERNEL ) ;
404
+
405
405
if (!tmr )
406
406
return tmr ;
407
407
if (unlikely (!(tmr -> sigq = sigqueue_alloc ()))) {
@@ -695,8 +695,8 @@ void common_timer_get(struct k_itimer *timr, struct itimerspec64 *cur_setting)
695
695
696
696
static int do_timer_gettime (timer_t timer_id , struct itimerspec64 * setting )
697
697
{
698
- struct k_itimer * timr ;
699
698
const struct k_clock * kc ;
699
+ struct k_itimer * timr ;
700
700
unsigned long flags ;
701
701
int ret = 0 ;
702
702
@@ -767,8 +767,8 @@ SYSCALL_DEFINE2(timer_gettime32, timer_t, timer_id,
767
767
SYSCALL_DEFINE1 (timer_getoverrun , timer_t , timer_id )
768
768
{
769
769
struct k_itimer * timr ;
770
- int overrun ;
771
770
unsigned long flags ;
771
+ int overrun ;
772
772
773
773
timr = lock_timer (timer_id , & flags );
774
774
if (!timr )
@@ -941,8 +941,7 @@ SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
941
941
const struct __kernel_itimerspec __user * , new_setting ,
942
942
struct __kernel_itimerspec __user * , old_setting )
943
943
{
944
- struct itimerspec64 new_spec , old_spec ;
945
- struct itimerspec64 * rtn = old_setting ? & old_spec : NULL ;
944
+ struct itimerspec64 new_spec , old_spec , * rtn ;
946
945
int error = 0 ;
947
946
948
947
if (!new_setting )
@@ -951,6 +950,7 @@ SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
951
950
if (get_itimerspec64 (& new_spec , new_setting ))
952
951
return - EFAULT ;
953
952
953
+ rtn = old_setting ? & old_spec : NULL ;
954
954
error = do_timer_settime (timer_id , flags , & new_spec , rtn );
955
955
if (!error && old_setting ) {
956
956
if (put_itimerspec64 (& old_spec , old_setting ))
0 commit comments