6 files changed, 8 insertions, 8 deletions
diff --git a/src/arch/arm/faults.hh b/src/arch/arm/faults.hh
index a68e7b2ef..6c1b223ab 100644
--- a/src/arch/arm/faults.hh
+++ b/src/arch/arm/faults.hh
@@ -246,6 +246,6 @@ static inline Fault genMachineCheckFault()
     return new Reset();
 }
 
-} // ArmISA namespace
+} // namespace ArmISA
 
 #endif // __ARM_FAULTS_HH__
diff --git a/src/arch/arm/isa_traits.hh b/src/arch/arm/isa_traits.hh
index a24852ba9..b2989e4b3 100644
--- a/src/arch/arm/isa_traits.hh
+++ b/src/arch/arm/isa_traits.hh
@@ -48,7 +48,7 @@
 #include "arch/arm/types.hh"
 #include "base/types.hh"
 
-namespace LittleEndianGuest {};
+namespace LittleEndianGuest {}
 
 #define TARGET_ARM
 
@@ -123,7 +123,7 @@ namespace ArmISA
         INT_FIQ,
         NumInterruptTypes
     };
-};
+} // namespace ArmISA
 
 using namespace ArmISA;
 
diff --git a/src/arch/arm/kernel_stats.hh b/src/arch/arm/kernel_stats.hh
index 18bdc500d..be5c25bd5 100644
--- a/src/arch/arm/kernel_stats.hh
+++ b/src/arch/arm/kernel_stats.hh
@@ -51,7 +51,7 @@ class Statistics : public ::Kernel::Statistics
     {}
 };
 
-} /* end namespace ArmISA::Kernel */
-} /* end namespace ArmISA */
+} // namespace ArmISA::Kernel
+} // namespace ArmISA
 
 #endif // __ARCH_ARM_KERNEL_STATS_HH__
diff --git a/src/arch/arm/nativetrace.cc b/src/arch/arm/nativetrace.cc
index 75546f8de..531a6ee2e 100644
--- a/src/arch/arm/nativetrace.cc
+++ b/src/arch/arm/nativetrace.cc
@@ -192,7 +192,7 @@ Trace::ArmNativeTrace::check(NativeTraceRecord *record)
     }
 }
 
-} /* namespace Trace */
+} // namespace Trace
 
 ////////////////////////////////////////////////////////////////////////
 //
diff --git a/src/arch/arm/nativetrace.hh b/src/arch/arm/nativetrace.hh
index 7467e3378..221d40e2f 100644
--- a/src/arch/arm/nativetrace.hh
+++ b/src/arch/arm/nativetrace.hh
@@ -107,6 +107,6 @@ class ArmNativeTrace : public NativeTrace
     void check(NativeTraceRecord *record);
 };
 
-} /* namespace Trace */
+} // namespace Trace
 
 #endif // __ARCH_ARM_NATIVETRACE_HH__
diff --git a/src/arch/arm/tlb.hh b/src/arch/arm/tlb.hh
index 5b24eebe2..1374123b2 100644
--- a/src/arch/arm/tlb.hh
+++ b/src/arch/arm/tlb.hh
@@ -239,6 +239,6 @@ public:
     inline void invalidateMiscReg() { miscRegValid = false; }
 };
 
-/* namespace ArmISA */ }
+} // namespace ArmISA
 
 #endif // __ARCH_ARM_TLB_HH__