diff options
author | Nicolas Kaiser <nikai@nikai.net> | 2010-08-05 14:23:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 16:21:24 -0400 |
commit | c95940f264e59ff8d21d76ace47bac1018912800 (patch) | |
tree | 74e1529fe9424f9d8cd8908eece4182f0f021e06 /Documentation/kbuild | |
parent | eb07e1b4ac544abaf4ec8ad25cdbe39485de6842 (diff) |
Documentation: fix kbuild typos and wording
Fixed some typos and wording.
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation/kbuild')
-rw-r--r-- | Documentation/kbuild/kbuild.txt | 8 | ||||
-rw-r--r-- | Documentation/kbuild/makefiles.txt | 24 |
2 files changed, 16 insertions, 16 deletions
diff --git a/Documentation/kbuild/kbuild.txt b/Documentation/kbuild/kbuild.txt index 634c625da8ce..0d8addbb0fae 100644 --- a/Documentation/kbuild/kbuild.txt +++ b/Documentation/kbuild/kbuild.txt | |||
@@ -40,15 +40,15 @@ Set the directory to look for the kernel source when building external | |||
40 | modules. | 40 | modules. |
41 | The directory can be specified in several ways: | 41 | The directory can be specified in several ways: |
42 | 1) Use "M=..." on the command line | 42 | 1) Use "M=..." on the command line |
43 | 2) Environmnet variable KBUILD_EXTMOD | 43 | 2) Environment variable KBUILD_EXTMOD |
44 | 3) Environmnet variable SUBDIRS | 44 | 3) Environment variable SUBDIRS |
45 | The possibilities are listed in the order they take precedence. | 45 | The possibilities are listed in the order they take precedence. |
46 | Using "M=..." will always override the others. | 46 | Using "M=..." will always override the others. |
47 | 47 | ||
48 | KBUILD_OUTPUT | 48 | KBUILD_OUTPUT |
49 | -------------------------------------------------- | 49 | -------------------------------------------------- |
50 | Specify the output directory when building the kernel. | 50 | Specify the output directory when building the kernel. |
51 | The output directory can also be specificed using "O=...". | 51 | The output directory can also be specified using "O=...". |
52 | Setting "O=..." takes precedence over KBUILD_OUTPUT. | 52 | Setting "O=..." takes precedence over KBUILD_OUTPUT. |
53 | 53 | ||
54 | ARCH | 54 | ARCH |
@@ -90,7 +90,7 @@ The script will be called with the following arguments: | |||
90 | $3 - kernel map file | 90 | $3 - kernel map file |
91 | $4 - default install path (use root directory if blank) | 91 | $4 - default install path (use root directory if blank) |
92 | 92 | ||
93 | The implmentation of "make install" is architecture specific | 93 | The implementation of "make install" is architecture specific |
94 | and it may differ from the above. | 94 | and it may differ from the above. |
95 | 95 | ||
96 | INSTALLKERNEL is provided to enable the possibility to | 96 | INSTALLKERNEL is provided to enable the possibility to |
diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 31bfcbf958fc..8abd041b605d 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt | |||
@@ -285,12 +285,12 @@ more details, with real examples. | |||
285 | --- 3.7 Compilation flags | 285 | --- 3.7 Compilation flags |
286 | 286 | ||
287 | ccflags-y, asflags-y and ldflags-y | 287 | ccflags-y, asflags-y and ldflags-y |
288 | The three flags listed above apply only to the kbuild makefile where | 288 | These three flags apply only to the kbuild makefile in which they |
289 | they are assigned (i.e., per-directory). They are used for all the | 289 | are assigned. They are used for all the normal cc, as and ld |
290 | normal cc, as and ld invocation happening during a recursive build. | 290 | invocations happening during a recursive build. |
291 | Note: Flags with the same behaviour were previously named: | 291 | Note: Flags with the same behaviour were previously named: |
292 | EXTRA_CFLAGS, EXTRA_AFLAGS and EXTRA_LDFLAGS. They are still | 292 | EXTRA_CFLAGS, EXTRA_AFLAGS and EXTRA_LDFLAGS. |
293 | supported but their use is deprecated. | 293 | They are still supported but their usage is deprecated. |
294 | 294 | ||
295 | ccflags-y specifies options for compiling with $(CC). | 295 | ccflags-y specifies options for compiling with $(CC). |
296 | 296 | ||
@@ -317,10 +317,10 @@ more details, with real examples. | |||
317 | 317 | ||
318 | subdir-ccflags-y, subdir-asflags-y | 318 | subdir-ccflags-y, subdir-asflags-y |
319 | The two flags listed above are similar to ccflags-y and asflags-y. | 319 | The two flags listed above are similar to ccflags-y and asflags-y. |
320 | The difference is that the subdir- variants affect the kbuild | 320 | The difference is that the subdir- variants have effect for the kbuild |
321 | file where they are present and all subdirectories. Options specified | 321 | file where they are present and all subdirectories. |
322 | using subdir-* are added to the commandline before the options | 322 | Options specified using subdir-* are added to the commandline before |
323 | specified using the non-subdir variants. | 323 | the options specified using the non-subdir variants. |
324 | 324 | ||
325 | Example: | 325 | Example: |
326 | subdir-ccflags-y := -Werror | 326 | subdir-ccflags-y := -Werror |
@@ -1174,14 +1174,14 @@ When kbuild executes, the following steps are followed (roughly): | |||
1174 | === 7 Kbuild syntax for exported headers | 1174 | === 7 Kbuild syntax for exported headers |
1175 | 1175 | ||
1176 | The kernel include a set of headers that is exported to userspace. | 1176 | The kernel include a set of headers that is exported to userspace. |
1177 | Many headers can be exported as-is but other headers requires a | 1177 | Many headers can be exported as-is but other headers require a |
1178 | minimal pre-processing before they are ready for user-space. | 1178 | minimal pre-processing before they are ready for user-space. |
1179 | The pre-processing does: | 1179 | The pre-processing does: |
1180 | - drop kernel specific annotations | 1180 | - drop kernel specific annotations |
1181 | - drop include of compiler.h | 1181 | - drop include of compiler.h |
1182 | - drop all sections that is kernel internat (guarded by ifdef __KERNEL__) | 1182 | - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) |
1183 | 1183 | ||
1184 | Each relevant directory contain a file name "Kbuild" which specify the | 1184 | Each relevant directory contains a file name "Kbuild" which specifies the |
1185 | headers to be exported. | 1185 | headers to be exported. |
1186 | See subsequent chapter for the syntax of the Kbuild file. | 1186 | See subsequent chapter for the syntax of the Kbuild file. |
1187 | 1187 | ||