Merge ARM into the head. ARM will compile but may not actually work.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/sim/async.hh b/src/sim/async.hh
index 932f975d2..6dd5b8a0d 100644
--- a/src/sim/async.hh
+++ b/src/sim/async.hh
@@ -42,12 +42,12 @@
 /// then checked in the main event loop.  Defined in main.cc.
 /// @note See the PollQueue object (in pollevent.hh) for the use of async_io and async_alarm.
 //@{
-extern volatile bool async_event;	///< Some asynchronous event has happened.
-extern volatile bool async_statdump;	///< Async request to dump stats.
-extern volatile bool async_statreset;	///< Async request to reset stats.
-extern volatile bool async_exit;	///< Async request to exit simulator.
-extern volatile bool async_io;		///< Async I/O request (SIGIO).
-extern volatile bool async_alarm;	///< Async alarm event (SIGALRM).
+extern volatile bool async_event;       ///< Some asynchronous event has happened.
+extern volatile bool async_statdump;    ///< Async request to dump stats.
+extern volatile bool async_statreset;   ///< Async request to reset stats.
+extern volatile bool async_exit;        ///< Async request to exit simulator.
+extern volatile bool async_io;          ///< Async I/O request (SIGIO).
+extern volatile bool async_alarm;       ///< Async alarm event (SIGALRM).
 extern volatile bool async_exception;   ///< Python exception.
 //@}