diff -r 8f868894ceb1 -r fe7d6fcd61c2 src/arch/x86/linux/syscalls.cc
--- a/src/arch/x86/linux/syscalls.cc	Tue Mar 15 13:50:31 2011 -0700
+++ b/src/arch/x86/linux/syscalls.cc	Thu Mar 17 15:58:50 2011 -0700
@@ -229,7 +229,7 @@
     /*  13 */ SyscallDesc("rt_sigaction", ignoreFunc),
     /*  14 */ SyscallDesc("rt_sigprocmask", ignoreFunc),
     /*  15 */ SyscallDesc("rt_sigreturn", unimplementedFunc),
-    /*  16 */ SyscallDesc("ioctl", unimplementedFunc),
+    /*  16 */ SyscallDesc("ioctl", ioctlFunc<X86Linux64>),
     /*  17 */ SyscallDesc("pread64", unimplementedFunc),
     /*  18 */ SyscallDesc("pwrite64", unimplementedFunc),
     /*  19 */ SyscallDesc("readv", unimplementedFunc),
@@ -546,7 +546,7 @@
     /*  51 */ SyscallDesc("acct", unimplementedFunc),
     /*  52 */ SyscallDesc("umount2", unimplementedFunc),
     /*  53 */ SyscallDesc("lock", unimplementedFunc),
-    /*  54 */ SyscallDesc("ioctl", unimplementedFunc),
+    /*  54 */ SyscallDesc("ioctl", ioctlFunc<X86Linux32>),
     /*  55 */ SyscallDesc("fcntl", unimplementedFunc),
     /*  56 */ SyscallDesc("mpx", unimplementedFunc),
     /*  57 */ SyscallDesc("setpgid", unimplementedFunc),
diff -r 8f868894ceb1 -r fe7d6fcd61c2 src/sim/syscall_emul.hh
--- a/src/sim/syscall_emul.hh	Tue Mar 15 13:50:31 2011 -0700
+++ b/src/sim/syscall_emul.hh	Thu Mar 17 15:58:50 2011 -0700
@@ -500,20 +500,10 @@
     }
 
     switch (req) {
-      case OS::TIOCISATTY_:
-      case OS::TIOCGETP_:
-      case OS::TIOCSETP_:
-      case OS::TIOCSETN_:
-      case OS::TIOCSETC_:
-      case OS::TIOCGETC_:
-      case OS::TIOCGETS_:
-      case OS::TIOCGETA_:
-      case OS::TCSETAW_:
+      default:
+        warn("Unsupported ioctl call: ioctl(%d, %#x, ...) @ \n",
+              fd, req, tc->pcState());
         return -ENOTTY;
-
-      default:
-        fatal("Unsupported ioctl call: ioctl(%d, 0x%x, ...) @ \n",
-              fd, req, tc->pcState());
     }
 }