rpms/cpuspeed/devel cpuspeed-1.5-no-affected_cpus-fallback.patch, 1.1, 1.2

[Jarod Wilson]

Author: jwilson

Update of /cvs/pkgs/rpms/cpuspeed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32256

Modified Files:
	cpuspeed-1.5-no-affected_cpus-fallback.patch 
Log Message:
drop stray leftover debug addition in fallback patch

cpuspeed-1.5-no-affected_cpus-fallback.patch:

Index: cpuspeed-1.5-no-affected_cpus-fallback.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cpuspeed/devel/cpuspeed-1.5-no-affected_cpus-fallback.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cpuspeed-1.5-no-affected_cpus-fallback.patch	8 Oct 2008 22:57:43 -0000	1.1
+++ cpuspeed-1.5-no-affected_cpus-fallback.patch	8 Oct 2008 23:24:24 -0000	1.2
@@ -1,6 +1,6 @@
---- cpuspeed-1.2.1/cpuspeed.cc~	2008-09-26 17:16:19.000000000 -0400
-+++ cpuspeed-1.2.1/cpuspeed.cc	2008-09-26 17:16:38.000000000 -0400
-@@ -158,6 +158,8 @@ unsigned last_step; // lowest speed step
+--- cpuspeed-1.5/cpuspeed.cc.orig	2008-10-08 14:59:29.000000000 -0400
++++ cpuspeed-1.5/cpuspeed.cc	2008-10-08 19:22:33.000000000 -0400
+@@ -159,6 +159,8 @@ unsigned last_step; // lowest speed step
  // which CPU cores are we controlling
  unsigned tied_cpu_cores[MAX_TIED_CORES];
  unsigned num_tied_cores = 0;
@@ -9,7 +9,7 @@
  
  // display an error message and exit the program
  void
-@@ -484,12 +486,16 @@ get_times(
+@@ -485,12 +487,16 @@ get_times(
      if (nice_counts_as_idle)
      {
          idle_time += nice_time;
@@ -26,7 +26,7 @@
      }
  
      unsigned long total_time = user_time + system_time + idle_time;
-@@ -710,6 +716,7 @@ unsigned num_cores = 0; // how many CPU 
+@@ -711,6 +717,7 @@ unsigned num_cores = 0; // how many CPU 
  // restore  initial speed on program exit
  unsigned saved_speed = 0;
  char saved_governor[32];
@@ -34,7 +34,7 @@
  
  void
  term_handler(int which)
-@@ -720,6 +727,12 @@ term_handler(int which)
+@@ -721,6 +728,12 @@ term_handler(int which)
          write_line(GOVERNOR_FILE, "%s\n", saved_governor);
      }
  
@@ -47,11 +47,7 @@
      raise(which);
  }
  
-@@ -1032,9 +1045,11 @@ main(int argc, char * argv[])
-     //  cpufreq dir for each core
-     if (!num_tied_cores)
-     {
-+        fprintf(stderr, "No cores spec'd, trying to figure it out...\n");
+@@ -1036,6 +1049,7 @@ main(int argc, char * argv[])
          // iterate through all cpu cores in main process
          for (unsigned i = 0, forked = 0; i < num_cores && !forked; i++)
          {
@@ -59,7 +55,7 @@
              // does this core do cpufreq?
              char cpufreq_dir[256];
              snprintf(cpufreq_dir, sizeof cpufreq_dir, SYSFS_CPUFREQ_DIR, i);
-@@ -1066,7 +1081,14 @@ main(int argc, char * argv[])
+@@ -1067,7 +1081,14 @@ main(int argc, char * argv[])
              }
  #endif
              unsigned cores[MAX_TIED_CORES];
@@ -75,7 +71,7 @@
  
              // if we can't figure out the affected cores
              if (n == 0)
-@@ -1101,8 +1123,22 @@ main(int argc, char * argv[])
+@@ -1102,8 +1123,22 @@ main(int argc, char * argv[])
                      i, cores[0]
                  );
  #endif