Commit 5a5210c6 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'ktest-v3.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest

Pull ktest confusion fix from Steven Rostedt:
 "With the v3.7-rc2 kernel, the network cards on my target boxes were
  not being brought up.

  I found that the modules for the network was not being installed.
  This was due to the config CONFIG_MODULES_USE_ELF_RELA that came
  before CONFIG_MODULES, and confused ktest in thinking that
  CONFIG_MODULES=y was not found.

  Ktest needs to test all configs and not just stop if something starts
  with CONFIG_MODULES."

* tag 'ktest-v3.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
  ktest: Fix ktest confusion with CONFIG_MODULES_USE_ELF_RELA
parents 8e99165a 8bc5e4ea
...@@ -1740,10 +1740,12 @@ sub install { ...@@ -1740,10 +1740,12 @@ sub install {
open(IN, "$output_config") or dodie("Can't read config file"); open(IN, "$output_config") or dodie("Can't read config file");
while (<IN>) { while (<IN>) {
if (/CONFIG_MODULES(=y)?/) { if (/CONFIG_MODULES(=y)?/) {
$install_mods = 1 if (defined($1)); if (defined($1)) {
$install_mods = 1;
last; last;
} }
} }
}
close(IN); close(IN);
if (!$install_mods) { if (!$install_mods) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment