From 3a03188dbdb0b2cea963cbd5333591bb40d4f38f Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Sat, 28 Feb 2015 21:01:35 -0800
Subject: [PATCH] web: cpu_list.php fixes

---
 html/user/cpu_list.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/html/user/cpu_list.php b/html/user/cpu_list.php
index f88dfd9fef..371c3b8599 100644
--- a/html/user/cpu_list.php
+++ b/html/user/cpu_list.php
@@ -34,7 +34,7 @@ function compare($a, $b) {
 function get_data2() {
     $db = BoincDb::get();
     $x = $db->enum_fields('host', 'StdClass', 
-        'p_model, count(*) as nhosts, avg(p_ncpus) as ncores, avg(p_fpops*p_ncpus) as fpops',
+        'p_model, count(*) as nhosts, avg(p_ncpus) as ncores, avg(p_fpops) as fpops',
         'p_fpops>1e6 and p_fpops<1e11 and p_fpops <> 1e9 and expavg_credit>1 group by p_model',
         null
     );
@@ -137,7 +137,6 @@ function show_cpu_list($data) {
 }
 
 $d = get_cached_data(86400);
-$d = false;
 if ($d) {
     $data = unserialize($d);
 } else {