s/cpu_id/cpuId in o3 (to be consistent and match style), also fix some typos in

comments.

src/cpu/o3/cpu.cc

@@ -62,7 +62,7 @@ class BaseCPUParams;
 using namespace TheISA;
 
 BaseO3CPU::BaseO3CPU(BaseCPUParams *params)
-    : BaseCPU(params), cpu_id(0)
+    : BaseCPU(params), cpuId(0)
 {
 }
 

src/cpu/o3/cpu.hh

@@ -76,13 +76,13 @@ class BaseO3CPU : public BaseCPU
     void regStats();
 
     /** Sets this CPU's ID. */
-    void setCpuId(int id) { cpu_id = id; }
+    void setCpuId(int id) { cpuId = id; }
 
     /** Reads this CPU's ID. */
-    int readCpuId() { return cpu_id; }
+    int readCpuId() { return cpuId; }
 
   protected:
-    int cpu_id;
+    int cpuId;
 };
 
 /**