diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-03-19 18:56:36 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-03-19 18:56:36 +0000 |
| commit | 05a67b6aaaeb2d9bbc2ff084c3b03a6e274eb5a8 (patch) | |
| tree | 627a1bb9d1e00cc961a631e4729c1276cc59dfa5 | |
| parent | 65aa59fd071dca95da7f20c6c31e71c50e67f300 (diff) | |
| download | drakx-backup-do-not-use-05a67b6aaaeb2d9bbc2ff084c3b03a6e274eb5a8.tar drakx-backup-do-not-use-05a67b6aaaeb2d9bbc2ff084c3b03a6e274eb5a8.tar.gz drakx-backup-do-not-use-05a67b6aaaeb2d9bbc2ff084c3b03a6e274eb5a8.tar.bz2 drakx-backup-do-not-use-05a67b6aaaeb2d9bbc2ff084c3b03a6e274eb5a8.tar.xz drakx-backup-do-not-use-05a67b6aaaeb2d9bbc2ff084c3b03a6e274eb5a8.zip | |
(is_i586) simplify ; on less I/O on non x86 machines
| -rw-r--r-- | perl-install/detect_devices.pm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 8cc4935d3..d0f92694a 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -1157,10 +1157,8 @@ sub BIGMEM() { } sub is_i586() { + return 0 if arch() !~ /86/; my $cpuinfo = cat_('/proc/cpuinfo'); - if (arch() !~ /86/) { - return 0; - } $cpuinfo =~ /^cpu family\s*:\s*(\d+)/m && $1 < 6 || $cpuinfo =~ /^model name\s*:\s*Transmeta.* TM5800/m || # mdvbz#37866 !has_cpu_flag('cmov'); |