diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-25 05:04:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-25 05:04:51 -0400 |
| commit | 10c9850cb2ced2ce528e5b692c639974213a64ec (patch) | |
| tree | f8063beac0ba1dab069d25661845c5b7ef9a67c7 /scripts/basic | |
| parent | 0c2364791343e4b04cd1f097ff2abc2799062448 (diff) | |
| parent | 90a6cd503982bfd33ce8c70eb49bd2dd33bc6325 (diff) | |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/basic')
| -rw-r--r-- | scripts/basic/Makefile | 2 | ||||
| -rw-r--r-- | scripts/basic/fixdep.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/basic/Makefile b/scripts/basic/Makefile index ec10d9345bc2..0372b33febe5 100644 --- a/scripts/basic/Makefile +++ b/scripts/basic/Makefile | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | ### | 1 | ### |
| 2 | # Makefile.basic lists the most basic programs used during the build process. | 2 | # This Makefile lists the most basic programs used during the build process. |
| 3 | # The programs listed herein are what are needed to do the basic stuff, | 3 | # The programs listed herein are what are needed to do the basic stuff, |
| 4 | # such as fix file dependencies. | 4 | # such as fix file dependencies. |
| 5 | # This initial step is needed to avoid files to be recompiled | 5 | # This initial step is needed to avoid files to be recompiled |
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index fff818b92acb..bbf62cb1f819 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | * | 25 | * |
| 26 | * So we play the same trick that "mkdep" played before. We replace | 26 | * So we play the same trick that "mkdep" played before. We replace |
| 27 | * the dependency on autoconf.h by a dependency on every config | 27 | * the dependency on autoconf.h by a dependency on every config |
| 28 | * option which is mentioned in any of the listed prequisites. | 28 | * option which is mentioned in any of the listed prerequisites. |
| 29 | * | 29 | * |
| 30 | * kconfig populates a tree in include/config/ with an empty file | 30 | * kconfig populates a tree in include/config/ with an empty file |
| 31 | * for each config symbol and when the configuration is updated | 31 | * for each config symbol and when the configuration is updated |
| @@ -34,7 +34,7 @@ | |||
| 34 | * the config symbols are rebuilt. | 34 | * the config symbols are rebuilt. |
| 35 | * | 35 | * |
| 36 | * So if the user changes his CONFIG_HIS_DRIVER option, only the objects | 36 | * So if the user changes his CONFIG_HIS_DRIVER option, only the objects |
| 37 | * which depend on "include/linux/config/his/driver.h" will be rebuilt, | 37 | * which depend on "include/config/his/driver.h" will be rebuilt, |
| 38 | * so most likely only his driver ;-) | 38 | * so most likely only his driver ;-) |
| 39 | * | 39 | * |
| 40 | * The idea above dates, by the way, back to Michael E Chastain, AFAIK. | 40 | * The idea above dates, by the way, back to Michael E Chastain, AFAIK. |
| @@ -75,7 +75,7 @@ | |||
| 75 | * and then basically copies the .<target>.d file to stdout, in the | 75 | * and then basically copies the .<target>.d file to stdout, in the |
| 76 | * process filtering out the dependency on autoconf.h and adding | 76 | * process filtering out the dependency on autoconf.h and adding |
| 77 | * dependencies on include/config/my/option.h for every | 77 | * dependencies on include/config/my/option.h for every |
| 78 | * CONFIG_MY_OPTION encountered in any of the prequisites. | 78 | * CONFIG_MY_OPTION encountered in any of the prerequisites. |
| 79 | * | 79 | * |
| 80 | * It will also filter out all the dependencies on *.ver. We need | 80 | * It will also filter out all the dependencies on *.ver. We need |
| 81 | * to make sure that the generated version checksum are globally up | 81 | * to make sure that the generated version checksum are globally up |