Commit cda9a84
committed
Merge tag 's390-6.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Vasily Gorbik:
- Update defconfigs
- Fix linker script to align nospec tables correctly to avoid
potentially unbootable kernel with some config options
- Fix alignment check in prepare_hugepage_range() for 2GB hugepages to
avoid BUG in __unmap_hugepage_range() for unaligned mappings later
- Remove useless hugepage address alignment in hugetlb fault handling
* tag 's390-6.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/hugetlb: fix prepare_hugepage_range() check for 2 GB hugepages
s390: update defconfigs
s390: fix nospec table alignments
s390/mm: remove useless hugepage address alignmentFile tree
6 files changed
+65
-52
lines changed- arch/s390
- configs
- include/asm
- kernel
- mm
6 files changed
+65
-52
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
43 | | - | |
44 | | - | |
45 | 43 | | |
46 | 44 | | |
47 | 45 | | |
| |||
74 | 72 | | |
75 | 73 | | |
76 | 74 | | |
| 75 | + | |
77 | 76 | | |
78 | 77 | | |
79 | 78 | | |
| |||
93 | 92 | | |
94 | 93 | | |
95 | 94 | | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
96 | 99 | | |
97 | 100 | | |
98 | 101 | | |
| |||
102 | 105 | | |
103 | 106 | | |
104 | 107 | | |
105 | | - | |
106 | | - | |
107 | | - | |
108 | 108 | | |
109 | 109 | | |
110 | 110 | | |
111 | 111 | | |
112 | 112 | | |
| 113 | + | |
113 | 114 | | |
114 | 115 | | |
115 | 116 | | |
| |||
167 | 168 | | |
168 | 169 | | |
169 | 170 | | |
| 171 | + | |
170 | 172 | | |
171 | 173 | | |
172 | 174 | | |
| |||
493 | 495 | | |
494 | 496 | | |
495 | 497 | | |
496 | | - | |
497 | 498 | | |
498 | 499 | | |
499 | 500 | | |
| |||
509 | 510 | | |
510 | 511 | | |
511 | 512 | | |
512 | | - | |
| 513 | + | |
513 | 514 | | |
514 | 515 | | |
515 | 516 | | |
| |||
518 | 519 | | |
519 | 520 | | |
520 | 521 | | |
| 522 | + | |
521 | 523 | | |
| 524 | + | |
522 | 525 | | |
523 | 526 | | |
524 | 527 | | |
525 | | - | |
526 | 528 | | |
527 | 529 | | |
528 | 530 | | |
529 | 531 | | |
530 | 532 | | |
| 533 | + | |
531 | 534 | | |
532 | 535 | | |
533 | 536 | | |
534 | 537 | | |
535 | 538 | | |
536 | 539 | | |
537 | 540 | | |
538 | | - | |
539 | 541 | | |
540 | 542 | | |
| 543 | + | |
541 | 544 | | |
542 | 545 | | |
543 | 546 | | |
| |||
570 | 573 | | |
571 | 574 | | |
572 | 575 | | |
| 576 | + | |
| 577 | + | |
573 | 578 | | |
574 | 579 | | |
575 | 580 | | |
| |||
727 | 732 | | |
728 | 733 | | |
729 | 734 | | |
| 735 | + | |
730 | 736 | | |
731 | 737 | | |
732 | 738 | | |
733 | | - | |
| 739 | + | |
734 | 740 | | |
735 | 741 | | |
736 | 742 | | |
737 | 743 | | |
| 744 | + | |
| 745 | + | |
| 746 | + | |
738 | 747 | | |
739 | | - | |
| 748 | + | |
| 749 | + | |
| 750 | + | |
740 | 751 | | |
| 752 | + | |
741 | 753 | | |
| 754 | + | |
742 | 755 | | |
743 | 756 | | |
744 | 757 | | |
745 | 758 | | |
746 | 759 | | |
747 | 760 | | |
748 | 761 | | |
| 762 | + | |
749 | 763 | | |
750 | 764 | | |
| 765 | + | |
751 | 766 | | |
| 767 | + | |
752 | 768 | | |
753 | | - | |
| 769 | + | |
754 | 770 | | |
755 | 771 | | |
756 | 772 | | |
| |||
766 | 782 | | |
767 | 783 | | |
768 | 784 | | |
769 | | - | |
770 | | - | |
771 | | - | |
772 | | - | |
773 | | - | |
774 | | - | |
775 | | - | |
776 | | - | |
777 | | - | |
778 | | - | |
779 | 785 | | |
780 | 786 | | |
781 | 787 | | |
| |||
797 | 803 | | |
798 | 804 | | |
799 | 805 | | |
| 806 | + | |
800 | 807 | | |
801 | 808 | | |
802 | 809 | | |
| |||
808 | 815 | | |
809 | 816 | | |
810 | 817 | | |
811 | | - | |
812 | | - | |
813 | 818 | | |
814 | 819 | | |
815 | 820 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | | - | |
42 | | - | |
43 | 41 | | |
44 | 42 | | |
45 | 43 | | |
| |||
69 | 67 | | |
70 | 68 | | |
71 | 69 | | |
| 70 | + | |
72 | 71 | | |
73 | 72 | | |
74 | 73 | | |
| |||
88 | 87 | | |
89 | 88 | | |
90 | 89 | | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
91 | 93 | | |
92 | 94 | | |
93 | 95 | | |
94 | 96 | | |
95 | 97 | | |
96 | 98 | | |
97 | 99 | | |
98 | | - | |
99 | | - | |
100 | | - | |
101 | 100 | | |
102 | 101 | | |
103 | 102 | | |
104 | 103 | | |
| 104 | + | |
105 | 105 | | |
106 | 106 | | |
107 | 107 | | |
| |||
159 | 159 | | |
160 | 160 | | |
161 | 161 | | |
| 162 | + | |
162 | 163 | | |
163 | 164 | | |
164 | 165 | | |
| |||
484 | 485 | | |
485 | 486 | | |
486 | 487 | | |
487 | | - | |
488 | 488 | | |
489 | 489 | | |
490 | 490 | | |
| |||
500 | 500 | | |
501 | 501 | | |
502 | 502 | | |
503 | | - | |
| 503 | + | |
504 | 504 | | |
505 | 505 | | |
506 | 506 | | |
| |||
509 | 509 | | |
510 | 510 | | |
511 | 511 | | |
| 512 | + | |
512 | 513 | | |
| 514 | + | |
513 | 515 | | |
514 | 516 | | |
515 | 517 | | |
516 | | - | |
517 | 518 | | |
518 | 519 | | |
519 | 520 | | |
520 | 521 | | |
521 | 522 | | |
| 523 | + | |
522 | 524 | | |
523 | 525 | | |
524 | 526 | | |
525 | 527 | | |
526 | 528 | | |
527 | 529 | | |
528 | 530 | | |
529 | | - | |
530 | 531 | | |
531 | 532 | | |
| 533 | + | |
532 | 534 | | |
533 | 535 | | |
534 | 536 | | |
| |||
561 | 563 | | |
562 | 564 | | |
563 | 565 | | |
| 566 | + | |
| 567 | + | |
564 | 568 | | |
565 | 569 | | |
566 | 570 | | |
| |||
713 | 717 | | |
714 | 718 | | |
715 | 719 | | |
| 720 | + | |
716 | 721 | | |
717 | 722 | | |
718 | 723 | | |
719 | | - | |
| 724 | + | |
720 | 725 | | |
721 | 726 | | |
722 | 727 | | |
723 | 728 | | |
| 729 | + | |
| 730 | + | |
| 731 | + | |
724 | 732 | | |
725 | | - | |
| 733 | + | |
| 734 | + | |
| 735 | + | |
726 | 736 | | |
| 737 | + | |
727 | 738 | | |
| 739 | + | |
728 | 740 | | |
729 | 741 | | |
730 | 742 | | |
731 | 743 | | |
732 | 744 | | |
733 | 745 | | |
734 | 746 | | |
| 747 | + | |
735 | 748 | | |
736 | 749 | | |
| 750 | + | |
737 | 751 | | |
| 752 | + | |
738 | 753 | | |
739 | | - | |
| 754 | + | |
740 | 755 | | |
741 | 756 | | |
742 | 757 | | |
| |||
752 | 767 | | |
753 | 768 | | |
754 | 769 | | |
755 | | - | |
756 | | - | |
757 | | - | |
758 | | - | |
759 | | - | |
760 | | - | |
761 | | - | |
762 | | - | |
763 | | - | |
764 | | - | |
765 | 770 | | |
766 | 771 | | |
767 | 772 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | 1 | | |
3 | 2 | | |
4 | 3 | | |
| |||
9 | 8 | | |
10 | 9 | | |
11 | 10 | | |
12 | | - | |
13 | 11 | | |
14 | 12 | | |
15 | 13 | | |
| |||
28 | 26 | | |
29 | 27 | | |
30 | 28 | | |
| 29 | + | |
| 30 | + | |
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| |||
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
| 56 | + | |
56 | 57 | | |
57 | 58 | | |
58 | 59 | | |
59 | 60 | | |
| 61 | + | |
60 | 62 | | |
61 | 63 | | |
62 | 64 | | |
| |||
0 commit comments