Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit bd3a8492baecde685a7568f9785651e9b11747f5

Authored by Daniel Walker
Committed by Linus Torvalds
1 parent 9f8dbe9c9c
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

whitespace fixes: compat syscalls 

Signed-off-by: Daniel Walker <dwalker@mvista.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 30 additions and 30 deletions Side-by-side Diff

... ... @@ -247,8 +247,8 @@
247 247 int ret;
248 248 mm_segment_t old_fs = get_fs ();
249 249  
250   - if (resource >= RLIM_NLIMITS)
251   - return -EINVAL;
  250 + if (resource >= RLIM_NLIMITS)
  251 + return -EINVAL;
252 252  
253 253 if (!access_ok(VERIFY_READ, rlim, sizeof(*rlim)) ||
254 254 __get_user(r.rlim_cur, &rlim->rlim_cur) ||
255 255  
256 256  
257 257  
... ... @@ -477,21 +477,21 @@
477 477  
478 478 int get_compat_itimerspec(struct itimerspec *dst,
479 479 const struct compat_itimerspec __user *src)
480   -{
  480 +{
481 481 if (get_compat_timespec(&dst->it_interval, &src->it_interval) ||
482 482 get_compat_timespec(&dst->it_value, &src->it_value))
483 483 return -EFAULT;
484 484 return 0;
485   -}
  485 +}
486 486  
487 487 int put_compat_itimerspec(struct compat_itimerspec __user *dst,
488 488 const struct itimerspec *src)
489   -{
  489 +{
490 490 if (put_compat_timespec(&src->it_interval, &dst->it_interval) ||
491 491 put_compat_timespec(&src->it_value, &dst->it_value))
492 492 return -EFAULT;
493 493 return 0;
494   -}
  494 +}
495 495  
496 496 long compat_sys_timer_create(clockid_t which_clock,
497 497 struct compat_sigevent __user *timer_event_spec,
498 498  
... ... @@ -512,9 +512,9 @@
512 512 }
513 513  
514 514 long compat_sys_timer_settime(timer_t timer_id, int flags,
515   - struct compat_itimerspec __user *new,
  515 + struct compat_itimerspec __user *new,
516 516 struct compat_itimerspec __user *old)
517   -{
  517 +{
518 518 long err;
519 519 mm_segment_t oldfs;
520 520 struct itimerspec newts, oldts;
521 521  
522 522  
523 523  
524 524  
525 525  
526 526  
527 527  
528 528  
529 529  
530 530  
531 531  
... ... @@ -522,58 +522,58 @@
522 522 if (!new)
523 523 return -EINVAL;
524 524 if (get_compat_itimerspec(&newts, new))
525   - return -EFAULT;
  525 + return -EFAULT;
526 526 oldfs = get_fs();
527 527 set_fs(KERNEL_DS);
528 528 err = sys_timer_settime(timer_id, flags,
529 529 (struct itimerspec __user *) &newts,
530 530 (struct itimerspec __user *) &oldts);
531   - set_fs(oldfs);
  531 + set_fs(oldfs);
532 532 if (!err && old && put_compat_itimerspec(old, &oldts))
533 533 return -EFAULT;
534 534 return err;
535   -}
  535 +}
536 536  
537 537 long compat_sys_timer_gettime(timer_t timer_id,
538 538 struct compat_itimerspec __user *setting)
539   -{
  539 +{
540 540 long err;
541 541 mm_segment_t oldfs;
542   - struct itimerspec ts;
  542 + struct itimerspec ts;
543 543  
544 544 oldfs = get_fs();
545 545 set_fs(KERNEL_DS);
546 546 err = sys_timer_gettime(timer_id,
547   - (struct itimerspec __user *) &ts);
548   - set_fs(oldfs);
  547 + (struct itimerspec __user *) &ts);
  548 + set_fs(oldfs);
549 549 if (!err && put_compat_itimerspec(setting, &ts))
550 550 return -EFAULT;
551 551 return err;
552   -}
  552 +}
553 553  
554 554 long compat_sys_clock_settime(clockid_t which_clock,
555 555 struct compat_timespec __user *tp)
556 556 {
557 557 long err;
558 558 mm_segment_t oldfs;
559   - struct timespec ts;
  559 + struct timespec ts;
560 560  
561 561 if (get_compat_timespec(&ts, tp))
562   - return -EFAULT;
  562 + return -EFAULT;
563 563 oldfs = get_fs();
564   - set_fs(KERNEL_DS);
  564 + set_fs(KERNEL_DS);
565 565 err = sys_clock_settime(which_clock,
566 566 (struct timespec __user *) &ts);
567 567 set_fs(oldfs);
568 568 return err;
569   -}
  569 +}
570 570  
571 571 long compat_sys_clock_gettime(clockid_t which_clock,
572 572 struct compat_timespec __user *tp)
573 573 {
574 574 long err;
575 575 mm_segment_t oldfs;
576   - struct timespec ts;
  576 + struct timespec ts;
577 577  
578 578 oldfs = get_fs();
579 579 set_fs(KERNEL_DS);
580 580  
581 581  
... ... @@ -581,16 +581,16 @@
581 581 (struct timespec __user *) &ts);
582 582 set_fs(oldfs);
583 583 if (!err && put_compat_timespec(&ts, tp))
584   - return -EFAULT;
  584 + return -EFAULT;
585 585 return err;
586   -}
  586 +}
587 587  
588 588 long compat_sys_clock_getres(clockid_t which_clock,
589 589 struct compat_timespec __user *tp)
590 590 {
591 591 long err;
592 592 mm_segment_t oldfs;
593   - struct timespec ts;
  593 + struct timespec ts;
594 594  
595 595 oldfs = get_fs();
596 596 set_fs(KERNEL_DS);
597 597  
... ... @@ -598,9 +598,9 @@
598 598 (struct timespec __user *) &ts);
599 599 set_fs(oldfs);
600 600 if (!err && tp && put_compat_timespec(&ts, tp))
601   - return -EFAULT;
  601 + return -EFAULT;
602 602 return err;
603   -}
  603 +}
604 604  
605 605 static long compat_clock_nanosleep_restart(struct restart_block *restart)
606 606 {
607 607  
... ... @@ -632,10 +632,10 @@
632 632 {
633 633 long err;
634 634 mm_segment_t oldfs;
635   - struct timespec in, out;
  635 + struct timespec in, out;
636 636 struct restart_block *restart;
637 637  
638   - if (get_compat_timespec(&in, rqtp))
  638 + if (get_compat_timespec(&in, rqtp))
639 639 return -EFAULT;
640 640  
641 641 oldfs = get_fs();
... ... @@ -654,8 +654,8 @@
654 654 restart->fn = compat_clock_nanosleep_restart;
655 655 restart->arg1 = (unsigned long) rmtp;
656 656 }
657   - return err;
658   -}
  657 + return err;
  658 +}
659 659  
660 660 /*
661 661 * We currently only need the following fields from the sigevent