diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-01 11:55:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-01 11:55:52 -0400 |
commit | 1f73897861b8ef0be64ff4b801f8d6f830f683b5 (patch) | |
tree | b4bae8f12e1422113910d8cb00a19d010dc4a52f /Documentation | |
parent | b904d7131d116900524bd36ec170dcd97846bfd3 (diff) | |
parent | 64ffc9ff424c65adcffe7d590018cc75e2d5d42a (diff) |
Merge branch 'for-35' of git://repo.or.cz/linux-kbuild
* 'for-35' of git://repo.or.cz/linux-kbuild: (81 commits)
kbuild: Revert part of e8d400a to resolve a conflict
kbuild: Fix checking of scm-identifier variable
gconfig: add support to show hidden options that have prompts
menuconfig: add support to show hidden options which have prompts
gconfig: remove show_debug option
gconfig: remove dbg_print_ptype() and dbg_print_stype()
kconfig: fix zconfdump()
kconfig: some small fixes
add random binaries to .gitignore
kbuild: Include gen_initramfs_list.sh and the file list in the .d file
kconfig: recalc symbol value before showing search results
.gitignore: ignore *.lzo files
headerdep: perlcritic warning
scripts/Makefile.lib: Align the output of LZO
kbuild: Generate modules.builtin in make modules_install
Revert "kbuild: specify absolute paths for cscope"
kbuild: Do not unnecessarily regenerate modules.builtin
headers_install: use local file handles
headers_check: fix perl warnings
export_report: fix perl warnings
...
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/.gitignore | 7 | ||||
-rw-r--r-- | Documentation/kbuild/kbuild.txt | 6 | ||||
-rw-r--r-- | Documentation/mutex-design.txt | 4 |
3 files changed, 14 insertions, 3 deletions
diff --git a/Documentation/.gitignore b/Documentation/.gitignore new file mode 100644 index 000000000000..bcd907b4141f --- /dev/null +++ b/Documentation/.gitignore | |||
@@ -0,0 +1,7 @@ | |||
1 | filesystems/dnotify_test | ||
2 | laptops/dslm | ||
3 | timers/hpet_example | ||
4 | vm/hugepage-mmap | ||
5 | vm/hugepage-shm | ||
6 | vm/map_hugetlb | ||
7 | |||
diff --git a/Documentation/kbuild/kbuild.txt b/Documentation/kbuild/kbuild.txt index 6f8c1cabbc5d..634c625da8ce 100644 --- a/Documentation/kbuild/kbuild.txt +++ b/Documentation/kbuild/kbuild.txt | |||
@@ -65,7 +65,7 @@ CROSS_COMPILE | |||
65 | Specify an optional fixed part of the binutils filename. | 65 | Specify an optional fixed part of the binutils filename. |
66 | CROSS_COMPILE can be a part of the filename or the full path. | 66 | CROSS_COMPILE can be a part of the filename or the full path. |
67 | 67 | ||
68 | CROSS_COMPILE is also used for ccache is some setups. | 68 | CROSS_COMPILE is also used for ccache in some setups. |
69 | 69 | ||
70 | CF | 70 | CF |
71 | -------------------------------------------------- | 71 | -------------------------------------------------- |
@@ -162,3 +162,7 @@ For tags/TAGS/cscope targets, you can specify more than one arch | |||
162 | to be included in the databases, separated by blank space. E.g.: | 162 | to be included in the databases, separated by blank space. E.g.: |
163 | 163 | ||
164 | $ make ALLSOURCE_ARCHS="x86 mips arm" tags | 164 | $ make ALLSOURCE_ARCHS="x86 mips arm" tags |
165 | |||
166 | To get all available archs you can also specify all. E.g.: | ||
167 | |||
168 | $ make ALLSOURCE_ARCHS=all tags | ||
diff --git a/Documentation/mutex-design.txt b/Documentation/mutex-design.txt index aa60d1f627e5..c91ccc0720fa 100644 --- a/Documentation/mutex-design.txt +++ b/Documentation/mutex-design.txt | |||
@@ -66,14 +66,14 @@ of advantages of mutexes: | |||
66 | 66 | ||
67 | c0377ccb <mutex_lock>: | 67 | c0377ccb <mutex_lock>: |
68 | c0377ccb: f0 ff 08 lock decl (%eax) | 68 | c0377ccb: f0 ff 08 lock decl (%eax) |
69 | c0377cce: 78 0e js c0377cde <.text.lock.mutex> | 69 | c0377cce: 78 0e js c0377cde <.text..lock.mutex> |
70 | c0377cd0: c3 ret | 70 | c0377cd0: c3 ret |
71 | 71 | ||
72 | the unlocking fastpath is equally tight: | 72 | the unlocking fastpath is equally tight: |
73 | 73 | ||
74 | c0377cd1 <mutex_unlock>: | 74 | c0377cd1 <mutex_unlock>: |
75 | c0377cd1: f0 ff 00 lock incl (%eax) | 75 | c0377cd1: f0 ff 00 lock incl (%eax) |
76 | c0377cd4: 7e 0f jle c0377ce5 <.text.lock.mutex+0x7> | 76 | c0377cd4: 7e 0f jle c0377ce5 <.text..lock.mutex+0x7> |
77 | c0377cd6: c3 ret | 77 | c0377cd6: c3 ret |
78 | 78 | ||
79 | - 'struct mutex' semantics are well-defined and are enforced if | 79 | - 'struct mutex' semantics are well-defined and are enforced if |