Merge branch 'linus' into x86/irq

[linux-2.6-omap-h63xx.git] / arch / um / include / mconsole.h

diff --git a/arch/um/include/mconsole.h b/arch/um/include/mconsole.h
index 58f67d3911052de522e01fb053edf2cbedd33549..c139ae1d682691771bfc84f8e0f3469cf7682743 100644 (file)
--- a/arch/um/include/mconsole.h
+++ b/arch/um/include/mconsole.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org)
- * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
@@ -12,6 +12,8 @@
 #define u32 uint32_t
 #endif
 
+#include "sysdep/ptrace.h"
+
 #define MCONSOLE_MAGIC (0xcafebabe)
 #define MCONSOLE_MAX_DATA (512)
 #define MCONSOLE_VERSION 2
@@ -61,6 +63,7 @@ struct mc_request
 
        struct mconsole_request request;
        struct mconsole_command *cmd;
+       struct uml_pt_regs regs;
 };
 
 extern char mconsole_socket_name[];
@@ -93,14 +96,3 @@ extern void lock_notify(void);
 extern void unlock_notify(void);
 
 #endif
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */