Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'docs-4.11-fixes' of git://git.lwn.net/linux
Pull documentation fixes from Jonathan Corbet:
"A few fixes for the docs tree, including one for a 4.11 build
regression"
* tag 'docs-4.11-fixes' of git://git.lwn.net/linux:
Documentation/sphinx: fix primary_domain configuration
docs: Fix htmldocs build failure
doc/ko_KR/memory-barriers: Update control-dependencies section
pcieaer doc: update the link
Documentation: Update path to sysrq.txt
+47
-41
+2
-2
Documentation/DocBook/Makefile
+2
-2
Documentation/DocBook/Makefile
···
7
7
# list of DOCBOOKS.
8
8
9
9
DOCBOOKS := z8530book.xml \
10
-
kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
10
+
kernel-hacking.xml kernel-locking.xml \
11
11
writing_usb_driver.xml networking.xml \
12
12
kernel-api.xml filesystems.xml lsm.xml kgdb.xml \
13
13
gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
14
14
genericirq.xml s390-drivers.xml scsi.xml \
15
-
sh.xml regulator.xml w1.xml \
15
+
sh.xml w1.xml \
16
16
writing_musb_glue_layer.xml
17
17
18
18
ifeq ($(DOCBOOKS),)
+1
-1
Documentation/PCI/pcieaer-howto.txt
+1
-1
Documentation/PCI/pcieaer-howto.txt
···
256
256
257
257
Then, you need a user space tool named aer-inject, which can be gotten
258
258
from:
259
-
http://www.kernel.org/pub/linux/utils/pci/aer-inject/
259
+
https://git.kernel.org/cgit/linux/kernel/git/gong.chen/aer-inject.git/
260
260
261
261
More information about aer-inject can be found in the document comes
262
262
with its source code.
+1
-1
Documentation/conf.py
+1
-1
Documentation/conf.py
···
135
135
# If true, `todo` and `todoList` produce output, else they produce nothing.
136
136
todo_include_todos = False
137
137
138
-
primary_domain = 'C'
138
+
primary_domain = 'c'
139
139
highlight_language = 'none'
140
140
141
141
# -- Options for HTML output ----------------------------------------------
+1
-1
Documentation/media/v4l-drivers/bttv.rst
+1
-1
Documentation/media/v4l-drivers/bttv.rst
···
312
312
protection faults (so-called "kernel oops").
313
313
314
314
If you run into some kind of deadlock, you can try to dump a call trace
315
-
for each process using sysrq-t (see Documentation/sysrq.txt).
315
+
for each process using sysrq-t (see Documentation/admin-guide/sysrq.rst).
316
316
This way it is possible to figure where *exactly* some process in "D"
317
317
state is stuck.
318
318
+1
-1
Documentation/s390/Debugging390.txt
+1
-1
Documentation/s390/Debugging390.txt
···
2116
2116
This is particularly useful for syncing disks unmounting & rebooting
2117
2117
if the machine gets partially hung.
2118
2118
2119
-
Read Documentation/sysrq.txt for more info
2119
+
Read Documentation/admin-guide/sysrq.rst for more info
2120
2120
2121
2121
References:
2122
2122
===========
+1
-1
Documentation/sysctl/kernel.txt
+1
-1
Documentation/sysctl/kernel.txt
+37
-31
Documentation/translations/ko_KR/memory-barriers.txt
+37
-31
Documentation/translations/ko_KR/memory-barriers.txt
···
662
662
컨νΈλ‘€ μμ‘΄μ±
663
663
-------------
664
664
665
+
νμ¬μ μ»΄νμΌλ¬λ€μ 컨νΈλ‘€ μμ‘΄μ±μ μ΄ν΄νκ³ μμ§ μκΈ° λλ¬Έμ 컨νΈλ‘€ μμ‘΄μ±μ
666
+
μ½κ° λ€λ£¨κΈ° μ΄λ €μΈ μ μμ΅λλ€. μ΄ μΉμ
μ λͺ©μ μ μ¬λ¬λΆμ΄ μ»΄νμΌλ¬μ 무μλ‘
667
+
μΈν΄ μ¬λ¬λΆμ μ½λκ° λ§κ°μ§λ κ±Έ λ§μ μ μλλ‘ λλκ²λλ€.
668
+
665
669
λ‘λ-λ‘λ 컨νΈλ‘€ μμ‘΄μ±μ λ°μ΄ν° μμ‘΄μ± λ°°λ¦¬μ΄λ§μΌλ‘λ μ νν λμν μκ°
666
670
μμ΄μ μ½κΈ° λ©λͺ¨λ¦¬ 배리μ΄λ₯Ό νμλ‘ ν©λλ€. μλμ μ½λλ₯Ό λ΄
μλ€:
667
671
···
693
689
694
690
q = READ_ONCE(a);
695
691
if (q) {
696
-
WRITE_ONCE(b, p);
692
+
WRITE_ONCE(b, 1);
697
693
}
698
694
699
695
컨νΈλ‘€ μμ‘΄μ±μ λ³΄ν΅ λ€λ₯Έ νμ
μ 배리μ΄λ€κ³Ό μ§μ λ§μΆ° μ¬μ©λ©λλ€. κ·Έλ λ€κ³€
700
-
νλ, READ_ONCE() λ λ°λμ μ¬μ©ν΄μΌ ν¨μ λΆλ λͺ
μ¬νμΈμ! READ_ONCE() κ°
701
-
μλ€λ©΄, μ»΄νμΌλ¬κ° 'a' λ‘λΆν°μ λ‘λλ₯Ό 'a' λ‘λΆν°μ λλ€λ₯Έ λ‘λμ, 'b' λ‘μ
702
-
μ€ν μ΄λ₯Ό 'b' λ‘μ λλ€λ₯Έ μ€ν μ΄μ μ‘°ν©ν΄ λ²λ € λ§€μ° λΉμ§κ΄μ μΈ κ²°κ³Όλ₯Ό μ΄λν μ
703
-
μμ΅λλ€.
696
+
νλ, READ_ONCE() λ WRITE_ONCE() λ μ νμ¬νμ΄ μλλΌ νμμ¬νμμ λΆλ
697
+
λͺ
μ¬νμΈμ! READ_ONCE() κ° μλ€λ©΄, μ»΄νμΌλ¬λ 'a' λ‘λΆν°μ λ‘λλ₯Ό 'a' λ‘λΆν°μ
698
+
λλ€λ₯Έ λ‘λμ μ‘°ν©ν μ μμ΅λλ€. WRITE_ONCE() κ° μλ€λ©΄, μ»΄νμΌλ¬λ 'b' λ‘μ
699
+
μ€ν μ΄λ₯Ό 'b' λ‘μ λλΌλ μ€ν μ΄λ€κ³Ό μ‘°ν©ν μ μμ΅λλ€. λ κ²½μ° λͺ¨λ μμμ
700
+
μμ΄ μλΉν λΉμ§κ΄μ μΈ κ²°κ³Όλ₯Ό μ΄λν μ μμ΅λλ€.
704
701
705
702
μ΄κ±Έλ‘ λμ΄ μλκ², μ»΄νμΌλ¬κ° λ³μ 'a' μ κ°μ΄ νμ 0μ΄ μλλΌκ³ μ¦λͺ
ν μ
706
703
μλ€λ©΄, μμ μμμ "if" λ¬Έμ μμ μ λ€μκ³Ό κ°μ΄ μ΅μ ν ν μλ μμ΅λλ€:
707
704
708
705
q = a;
709
-
b = p; /* BUG: Compiler and CPU can both reorder!!! */
706
+
b = 1; /* BUG: Compiler and CPU can both reorder!!! */
710
707
711
708
κ·Έλ¬λ READ_ONCE() λ₯Ό λ°λμ μ¬μ©νμΈμ.
712
709
···
717
712
q = READ_ONCE(a);
718
713
if (q) {
719
714
barrier();
720
-
WRITE_ONCE(b, p);
715
+
WRITE_ONCE(b, 1);
721
716
do_something();
722
717
} else {
723
718
barrier();
724
-
WRITE_ONCE(b, p);
719
+
WRITE_ONCE(b, 1);
725
720
do_something_else();
726
721
}
727
722
···
730
725
731
726
q = READ_ONCE(a);
732
727
barrier();
733
-
WRITE_ONCE(b, p); /* BUG: No ordering vs. load from a!!! */
728
+
WRITE_ONCE(b, 1); /* BUG: No ordering vs. load from a!!! */
734
729
if (q) {
735
-
/* WRITE_ONCE(b, p); -- moved up, BUG!!! */
730
+
/* WRITE_ONCE(b, 1); -- moved up, BUG!!! */
736
731
do_something();
737
732
} else {
738
-
/* WRITE_ONCE(b, p); -- moved up, BUG!!! */
733
+
/* WRITE_ONCE(b, 1); -- moved up, BUG!!! */
739
734
do_something_else();
740
735
}
741
736
···
747
742
748
743
q = READ_ONCE(a);
749
744
if (q) {
750
-
smp_store_release(&b, p);
745
+
smp_store_release(&b, 1);
751
746
do_something();
752
747
} else {
753
-
smp_store_release(&b, p);
748
+
smp_store_release(&b, 1);
754
749
do_something_else();
755
750
}
756
751
···
759
754
760
755
q = READ_ONCE(a);
761
756
if (q) {
762
-
WRITE_ONCE(b, p);
757
+
WRITE_ONCE(b, 1);
763
758
do_something();
764
759
} else {
765
-
WRITE_ONCE(b, r);
760
+
WRITE_ONCE(b, 2);
766
761
do_something_else();
767
762
}
768
763
···
775
770
776
771
q = READ_ONCE(a);
777
772
if (q % MAX) {
778
-
WRITE_ONCE(b, p);
773
+
WRITE_ONCE(b, 1);
779
774
do_something();
780
775
} else {
781
-
WRITE_ONCE(b, r);
776
+
WRITE_ONCE(b, 2);
782
777
do_something_else();
783
778
}
784
779
···
786
781
μμ μ½λλ₯Ό μλμ κ°μ΄ λ°κΏλ²λ¦΄ μ μμ΅λλ€:
787
782
788
783
q = READ_ONCE(a);
789
-
WRITE_ONCE(b, p);
784
+
WRITE_ONCE(b, 1);
790
785
do_something_else();
791
786
792
787
μ΄λ κ² λλ©΄, CPU λ λ³μ 'a' λ‘λΆν°μ λ‘λμ λ³μ 'b' λ‘μ μ€ν μ΄ μ¬μ΄μ μμλ₯Ό
···
798
793
q = READ_ONCE(a);
799
794
BUILD_BUG_ON(MAX <= 1); /* Order load from a with store to b. */
800
795
if (q % MAX) {
801
-
WRITE_ONCE(b, p);
796
+
WRITE_ONCE(b, 1);
802
797
do_something();
803
798
} else {
804
-
WRITE_ONCE(b, r);
799
+
WRITE_ONCE(b, 2);
805
800
do_something_else();
806
801
}
807
802
···
833
828
834
829
q = READ_ONCE(a);
835
830
if (q) {
836
-
WRITE_ONCE(b, p);
831
+
WRITE_ONCE(b, 1);
837
832
} else {
838
-
WRITE_ONCE(b, r);
833
+
WRITE_ONCE(b, 2);
839
834
}
840
-
WRITE_ONCE(c, 1); /* BUG: No ordering against the read from "a". */
835
+
WRITE_ONCE(c, 1); /* BUG: No ordering against the read from 'a'. */
841
836
842
-
μ»΄νμΌλ¬λ volatile νμ
μ λν μ‘μΈμ€λ₯Ό μ¬λ°°μΉ ν μ μκ³ μ΄ μ‘°κ±΄ νμ "b"
837
+
μ»΄νμΌλ¬λ volatile νμ
μ λν μ‘μΈμ€λ₯Ό μ¬λ°°μΉ ν μ μκ³ μ΄ μ‘°κ±΄ νμ 'b'
843
838
λ‘μ μ°κΈ°λ₯Ό μ¬λ°°μΉ ν μ μκΈ° λλ¬Έμ μ¬κΈ°μ μμ κ·μΉμ΄ μ‘΄μ¬νλ€κ³ μ£Όμ₯νκ³
844
839
μΆμ κ²λλ€. λΆννλ μ΄ κ²½μ°μ, μ»΄νμΌλ¬λ λ€μμ κ°μμ pseudo-assembly μΈμ΄
845
-
μ½λμ²λΌ "b" λ‘μ λκ°μ μ°κΈ° μ€νΌλ μ΄μ
μ conditional-move μΈμ€νΈλμ
μΌλ‘
840
+
μ½λμ²λΌ 'b' λ‘μ λκ°μ μ°κΈ° μ€νΌλ μ΄μ
μ conditional-move μΈμ€νΈλμ
μΌλ‘
846
841
λ²μν μ μμ΅λλ€:
847
842
848
843
ld r1,a
849
-
ld r2,p
850
-
ld r3,r
851
844
cmp r1,$0
852
-
cmov,ne r4,r2
853
-
cmov,eq r4,r3
845
+
cmov,ne r4,$1
846
+
cmov,eq r4,$2
854
847
st r4,b
855
848
st $1,c
856
849
857
-
μνλ μμ κ·μΉμ CPU λ "a" λ‘λΆν°μ λ‘λμ "c" λ‘μ μ€ν μ΄ μ¬μ΄μ μ΄λ€
850
+
μνλ μμ κ·μΉμ CPU λ 'a' λ‘λΆν°μ λ‘λμ 'c' λ‘μ μ€ν μ΄ μ¬μ΄μ μ΄λ€
858
851
μ’
λ₯μ μμ‘΄μ±λ κ°μ§ μμ κ²λλ€. μ΄ μ»¨νΈλ‘€ μμ‘΄μ±μ λκ°μ cmov μΈμ€νΈλμ
κ³Ό
859
852
κ±°κΈ°μ μμ‘΄νλ μ€ν μ΄ μκ²λ§ μ μ©λ κ²λλ€. μ§§κ² λ§νμλ©΄, 컨νΈλ‘€ μμ‘΄μ±μ
860
853
μ£Όμ΄μ§ if λ¬Έμ then μ κ³Ό else μ μκ²λ§ (κ·Έλ¦¬κ³ μ΄ λ μ λ΄μμ νΈμΆλλ
861
854
ν¨μλ€μκ²κΉμ§) μ μ©λμ§, μ΄ if λ¬Έμ λ€λ°λ₯΄λ μ½λμλ μ μ©λμ§ μμ΅λλ€.
862
855
863
856
λ§μ§λ§μΌλ‘, 컨νΈλ‘€ μμ‘΄μ±μ μ΄νμ± (transitivity) μ μ 곡νμ§ -μμ΅λλ€-. μ΄κ±΄
864
-
x μ y κ° λ λ€ 0 μ΄λΌλ μ΄κΈ°κ°μ κ°μ‘λ€λ κ°μ νμ λκ°μ μμ λ‘
857
+
'x' μ 'y' κ° λ λ€ 0 μ΄λΌλ μ΄κΈ°κ°μ κ°μ‘λ€λ κ°μ νμ λκ°μ μμ λ‘
865
858
보μ΄κ² μ΅λλ€:
866
859
867
860
CPU 0 CPU 1
···
926
923
927
924
(*) 컨νΈλ‘€ μμ‘΄μ±μ μ΄νμ±μ μ 곡νμ§ -μμ΅λλ€-. μ΄νμ±μ΄ νμνλ€λ©΄,
928
925
smp_mb() λ₯Ό μ¬μ©νμΈμ.
926
+
927
+
(*) μ»΄νμΌλ¬λ 컨νΈλ‘€ μμ‘΄μ±μ μ΄ν΄νκ³ μμ§ μμ΅λλ€. λ°λΌμ μ»΄νμΌλ¬κ°
928
+
μ¬λ¬λΆμ μ½λλ₯Ό λ§κ°λ¨λ¦¬μ§ μλλ‘ νλ건 μ¬λ¬λΆμ΄ ν΄μΌ νλ μΌμ
λλ€.
929
929
930
930
931
931
SMP λ°°λ¦¬μ΄ μ§λ§μΆκΈ°
+3
-3
Documentation/virtual/uml/UserModeLinux-HOWTO.txt
+3
-3
Documentation/virtual/uml/UserModeLinux-HOWTO.txt
···
2401
2401
2402
2402
This takes one argument, which is a single letter. It calls the
2403
2403
generic kernel's SysRq driver, which does whatever is called for by
2404
-
that argument. See the SysRq documentation in Documentation/sysrq.txt
2405
-
in your favorite kernel tree to see what letters are valid and what
2406
-
they do.
2404
+
that argument. See the SysRq documentation in
2405
+
Documentation/admin-guide/sysrq.rst in your favorite kernel tree to
2406
+
see what letters are valid and what they do.
2407
2407
2408
2408
2409
2409