Skip to content

Commit d6bd26b

Browse files
fukiamefukiame
committed
fixup! proc/sysctl: use shared variables for range check
followup of 2173a0f "BACKPORT: proc/sysctl: add shared variables for range check" deal with leftover qcom changes Signed-off-by: fukiame <[email protected]>
1 parent 98c024e commit d6bd26b

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

‎kernel/sysctl.c‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ static struct ctl_table kern_table[] = {
400400
.maxlen = sizeof(unsigned int),
401401
.mode = 0644,
402402
.proc_handler = walt_proc_user_hint_handler,
403-
.extra1 = &zero,
403+
.extra1 = SYSCTL_ZERO,
404404
.extra2 = (void *)&sched_user_hint_max,
405405
},
406406
{
@@ -409,7 +409,7 @@ static struct ctl_table kern_table[] = {
409409
.maxlen = sizeof(unsigned int),
410410
.mode = 0644,
411411
.proc_handler = proc_dointvec_minmax,
412-
.extra1 = &zero,
412+
.extra1 = SYSCTL_ZERO,
413413
.extra2 = &four,
414414
},
415415
{
@@ -433,7 +433,7 @@ static struct ctl_table kern_table[] = {
433433
.maxlen = sizeof(unsigned int),
434434
.mode = 0644,
435435
.proc_handler = walt_proc_group_thresholds_handler,
436-
.extra1 = &zero,
436+
.extra1 = SYSCTL_ZERO,
437437
.extra2 = &sysctl_sched_group_upmigrate_pct,
438438
},
439439
{
@@ -451,8 +451,8 @@ static struct ctl_table kern_table[] = {
451451
.maxlen = sizeof(unsigned int),
452452
.mode = 0644,
453453
.proc_handler = proc_dointvec_minmax,
454-
.extra1 = &zero,
455-
.extra2 = &one,
454+
.extra1 = SYSCTL_ZERO,
455+
.extra2 = SYSCTL_ONE,
456456
},
457457
{
458458
.procname = "sched_many_wakeup_threshold",
@@ -469,16 +469,16 @@ static struct ctl_table kern_table[] = {
469469
.maxlen = sizeof(unsigned int),
470470
.mode = 0644,
471471
.proc_handler = proc_dointvec_minmax,
472-
.extra1 = &zero,
473-
.extra2 = &one,
472+
.extra1 = SYSCTL_ZERO,
473+
.extra2 = SYSCTL_ONE,
474474
},
475475
{
476476
.procname = "sched_min_task_util_for_boost",
477477
.data = &sysctl_sched_min_task_util_for_boost,
478478
.maxlen = sizeof(unsigned int),
479479
.mode = 0644,
480480
.proc_handler = proc_dointvec_minmax,
481-
.extra1 = &zero,
481+
.extra1 = SYSCTL_ZERO,
482482
.extra2 = &one_thousand,
483483
},
484484
{
@@ -487,7 +487,7 @@ static struct ctl_table kern_table[] = {
487487
.maxlen = sizeof(unsigned int),
488488
.mode = 0644,
489489
.proc_handler = proc_dointvec_minmax,
490-
.extra1 = &zero,
490+
.extra1 = SYSCTL_ZERO,
491491
.extra2 = &one_thousand,
492492
},
493493
{
@@ -496,7 +496,7 @@ static struct ctl_table kern_table[] = {
496496
.maxlen = sizeof(unsigned int),
497497
.mode = 0644,
498498
.proc_handler = proc_dointvec_minmax,
499-
.extra1 = &one,
499+
.extra1 = SYSCTL_ONE,
500500
.extra2 = &one_hundred,
501501
},
502502
{
@@ -512,7 +512,7 @@ static struct ctl_table kern_table[] = {
512512
.maxlen = sizeof(unsigned int),
513513
.mode = 0644,
514514
.proc_handler = proc_dointvec_minmax,
515-
.extra1 = &one,
515+
.extra1 = SYSCTL_ONE,
516516
.extra2 = &two_hundred_million,
517517
},
518518
{
@@ -521,7 +521,7 @@ static struct ctl_table kern_table[] = {
521521
.maxlen = sizeof(unsigned int),
522522
.mode = 0644,
523523
.proc_handler = proc_douintvec_minmax_schedhyst,
524-
.extra1 = &zero,
524+
.extra1 = SYSCTL_ZERO,
525525
.extra2 = &two_hundred_fifty_five,
526526
},
527527
{
@@ -530,7 +530,7 @@ static struct ctl_table kern_table[] = {
530530
.maxlen = sizeof(unsigned int),
531531
.mode = 0644,
532532
.proc_handler = proc_douintvec_minmax_schedhyst,
533-
.extra1 = &zero,
533+
.extra1 = SYSCTL_ZERO,
534534
.extra2 = &ns_per_sec,
535535
},
536536
{
@@ -539,7 +539,7 @@ static struct ctl_table kern_table[] = {
539539
.maxlen = sizeof(unsigned int),
540540
.mode = 0644,
541541
.proc_handler = proc_douintvec_minmax_schedhyst,
542-
.extra1 = &zero,
542+
.extra1 = SYSCTL_ZERO,
543543
.extra2 = &two_hundred_fifty_five,
544544
},
545545
{
@@ -548,7 +548,7 @@ static struct ctl_table kern_table[] = {
548548
.maxlen = sizeof(unsigned int),
549549
.mode = 0644,
550550
.proc_handler = proc_douintvec_minmax_schedhyst,
551-
.extra1 = &zero,
551+
.extra1 = SYSCTL_ZERO,
552552
.extra2 = &ns_per_sec,
553553
},
554554
{
@@ -557,7 +557,7 @@ static struct ctl_table kern_table[] = {
557557
.maxlen = sizeof(unsigned int),
558558
.mode = 0644,
559559
.proc_handler = proc_douintvec_minmax_schedhyst,
560-
.extra1 = &zero,
560+
.extra1 = SYSCTL_ZERO,
561561
.extra2 = &one_hundred_thousand,
562562
},
563563
{
@@ -573,8 +573,8 @@ static struct ctl_table kern_table[] = {
573573
.maxlen = sizeof(unsigned int),
574574
.mode = 0644,
575575
.proc_handler = proc_dointvec_minmax,
576-
.extra1 = &zero,
577-
.extra2 = &one,
576+
.extra1 = SYSCTL_ZERO,
577+
.extra2 = SYSCTL_ONE,
578578
},
579579
{
580580
.procname = "sched_upmigrate",
@@ -596,7 +596,7 @@ static struct ctl_table kern_table[] = {
596596
.maxlen = sizeof(unsigned int),
597597
.mode = 0644,
598598
.proc_handler = proc_dointvec_minmax,
599-
.extra1 = &zero,
599+
.extra1 = SYSCTL_ZERO,
600600
.extra2 = &four,
601601
},
602602
{
@@ -614,7 +614,7 @@ static struct ctl_table kern_table[] = {
614614
.maxlen = sizeof(unsigned int),
615615
.mode = 0644,
616616
.proc_handler = proc_dointvec_minmax,
617-
.extra1 = &zero,
617+
.extra1 = SYSCTL_ZERO,
618618
.extra2 = &one_thousand,
619619
},
620620
#endif
@@ -624,8 +624,8 @@ static struct ctl_table kern_table[] = {
624624
.maxlen = sizeof(unsigned int),
625625
.mode = 0644,
626626
.proc_handler = proc_dointvec_minmax,
627-
.extra1 = &zero,
628-
.extra2 = &one,
627+
.extra1 = SYSCTL_ZERO,
628+
.extra2 = SYSCTL_ONE,
629629
},
630630
#ifdef CONFIG_SCHED_DEBUG
631631
{
@@ -821,7 +821,7 @@ static struct ctl_table kern_table[] = {
821821
.maxlen = sizeof(unsigned int),
822822
.mode = 0644,
823823
.proc_handler = proc_douintvec_minmax,
824-
.extra1 = &zero,
824+
.extra1 = SYSCTL_ZERO,
825825
.extra2 = &two_hundred_fifty_five,
826826
},
827827
#if defined(CONFIG_ENERGY_MODEL) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL)
@@ -831,8 +831,8 @@ static struct ctl_table kern_table[] = {
831831
.maxlen = sizeof(unsigned int),
832832
.mode = 0644,
833833
.proc_handler = sched_energy_aware_handler,
834-
.extra1 = &zero,
835-
.extra2 = &one,
834+
.extra1 = SYSCTL_ZERO,
835+
.extra2 = SYSCTL_ONE,
836836
},
837837
#endif
838838
#ifdef CONFIG_PROVE_LOCKING
@@ -1484,8 +1484,8 @@ static struct ctl_table kern_table[] = {
14841484
.maxlen = sizeof(int),
14851485
.mode = 0644,
14861486
.proc_handler = proc_dointvec_minmax,
1487-
.extra1 = &zero,
1488-
.extra2 = &one,
1487+
.extra1 = SYSCTL_ZERO,
1488+
.extra2 = SYSCTL_ONE,
14891489
},
14901490

14911491
#endif
@@ -1765,8 +1765,8 @@ static struct ctl_table vm_table[] = {
17651765
.maxlen = sizeof(want_old_faultaround_pte),
17661766
.mode = 0644,
17671767
.proc_handler = proc_dointvec_minmax,
1768-
.extra1 = &zero,
1769-
.extra2 = &one,
1768+
.extra1 = SYSCTL_ZERO,
1769+
.extra2 = SYSCTL_ONE,
17701770
},
17711771
#ifdef CONFIG_HUGETLB_PAGE
17721772
{
@@ -1867,15 +1867,15 @@ static struct ctl_table vm_table[] = {
18671867
.maxlen = sizeof(watermark_boost_factor),
18681868
.mode = 0644,
18691869
.proc_handler = watermark_boost_factor_sysctl_handler,
1870-
.extra1 = &zero,
1870+
.extra1 = SYSCTL_ZERO,
18711871
},
18721872
{
18731873
.procname = "kswapd_threads",
18741874
.data = &kswapd_threads,
18751875
.maxlen = sizeof(kswapd_threads),
18761876
.mode = 0644,
18771877
.proc_handler = kswapd_threads_sysctl_handler,
1878-
.extra1 = &one,
1878+
.extra1 = SYSCTL_ONE,
18791879
.extra2 = &max_kswapd_threads,
18801880
},
18811881
{
@@ -1893,7 +1893,7 @@ static struct ctl_table vm_table[] = {
18931893
.maxlen = sizeof(extra_free_kbytes),
18941894
.mode = 0644,
18951895
.proc_handler = min_free_kbytes_sysctl_handler,
1896-
.extra1 = &zero,
1896+
.extra1 = SYSCTL_ZERO,
18971897
},
18981898
{
18991899
.procname = "percpu_pagelist_fraction",

0 commit comments

Comments
 (0)