Fixup number-of-processor detection to handle ARM /proc/cpuinfowip-arm-port

There's a line with a stray 'processor' in the ARM /proc/cpuinfo that
doesn't start in the first column. Let's not count that.

2 files changed, 3 insertions, 3 deletions

diff --git a/make-devices b/make-devices
index 38f1e0a..3e16adf 100755
--- a/make-devices
+++ b/make-devices
@@ -8,7 +8,7 @@ die() {
 FT_TRACE_MAJOR=`grep ft_trace /proc/devices | awk '{print $1}'`
 SCHED_TRACE_MAJOR=`grep sched_trace /proc/devices | awk '{print $1}'`
 
-NUM_PROCS=$((`grep 'processor' /proc/cpuinfo | wc -l` - 1))
+NUM_PROCS=`egrep -c '^processor|online' /proc/cpuinfo`
 
 [ -z "$FT_TRACE_MAJOR" ] && die "Couldn't determine Feather-Trace major device number."
 [ -z "$SCHED_TRACE_MAJOR" ] && die "Couldn't determine sched_trace major device number."
@@ -16,7 +16,7 @@ NUM_PROCS=$((`grep 'processor' /proc/cpuinfo | wc -l` - 1))
 
 mknod -m 0666 feather-trace  c $FT_TRACE_MAJOR   0 || die "Couldn't create feather-trace."
 
-for P in `seq 0 $NUM_PROCS`
+for P in `seq 0 $((NUM_PROCS - 1))`
 do
     mknod -m 0666 "sched-trace$P" c  $SCHED_TRACE_MAJOR  $P || die "Couldn't create sched-trace$P."
 done
diff --git a/st_trace b/st_trace
index 35b6efc..9bf7726 100755
--- a/st_trace
+++ b/st_trace
@@ -6,7 +6,7 @@
 # Setup up sched_trace tracing.
 
 # works for sparc64 and Intel x86 if all CPUs are online
-NUM_CPUS=`egrep -c 'processor|online'   /proc/cpuinfo`
+NUM_CPUS=`egrep -c '^processor|online'   /proc/cpuinfo`
 
 ST_IDS="501 502 503 504 505 506 507 508 509"