* [PATCH 2/6] UML - fix compilation problems
@ 2007-03-27 18:27 ` Jeff Dike
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Dike @ 2007-03-27 18:27 UTC (permalink / raw)
To: Andrew Morton; +Cc: LKML, uml-devel
Fix a few miscellaneous compilation problems -
an assignment with mismatched types in ldt.c
a missing include in mconsole.h which needs a definition of uml_pt_regs
when auditing is configured there are some mismatched types in ptrace.c
I missed removing an include of user_util.h in hostfs
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
--
arch/um/include/mconsole.h | 2 ++
arch/um/kernel/ptrace.c | 14 +++++++-------
arch/um/sys-i386/ldt.c | 3 ++-
fs/hostfs/hostfs_kern.c | 1 -
4 files changed, 11 insertions(+), 9 deletions(-)
Index: linux-2.6.21-mm/arch/um/sys-i386/ldt.c
===================================================================
--- linux-2.6.21-mm.orig/arch/um/sys-i386/ldt.c 2007-03-27 12:25:16.000000000 -0400
+++ linux-2.6.21-mm/arch/um/sys-i386/ldt.c 2007-03-27 12:28:26.000000000 -0400
@@ -394,7 +394,8 @@ static short * host_ldt_entries = NULL;
static void ldt_get_host_info(void)
{
long ret;
- struct ldt_entry * ldt, *tmp;
+ struct ldt_entry * ldt;
+ short *tmp;
int i, size, k, order;
spin_lock(&host_ldt_lock);
Index: linux-2.6.21-mm/arch/um/include/mconsole.h
===================================================================
--- linux-2.6.21-mm.orig/arch/um/include/mconsole.h 2007-03-27 12:25:10.000000000 -0400
+++ linux-2.6.21-mm/arch/um/include/mconsole.h 2007-03-27 12:29:28.000000000 -0400
@@ -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
Index: linux-2.6.21-mm/arch/um/kernel/ptrace.c
===================================================================
--- linux-2.6.21-mm.orig/arch/um/kernel/ptrace.c 2007-03-27 12:25:18.000000000 -0400
+++ linux-2.6.21-mm/arch/um/kernel/ptrace.c 2007-03-27 12:34:43.000000000 -0400
@@ -53,8 +53,8 @@ void do_syscall_trace(struct pt_regs *re
secure_computing(PT_REGS_SYSCALL_NR(regs));
if (unlikely(current->audit_context) && entryexit)
- audit_syscall_exit(AUDITSC_RESULT(UPT_SYSCALL_RET(regs)),
- UPT_SYSCALL_RET(regs));
+ audit_syscall_exit(AUDITSC_RESULT(UPT_SYSCALL_RET(®s->regs)),
+ UPT_SYSCALL_RET(®s->regs));
if (test_thread_flag(TIF_SYSCALL_TRACE))
tracehook_report_syscall(regs, entryexit);
@@ -66,9 +66,9 @@ void do_syscall_trace(struct pt_regs *re
if (unlikely(current->audit_context) && !entryexit)
audit_syscall_entry(HOST_AUDIT_ARCH,
- UPT_SYSCALL_NR(regs),
- UPT_SYSCALL_ARG1(regs),
- UPT_SYSCALL_ARG2(regs),
- UPT_SYSCALL_ARG3(regs),
- UPT_SYSCALL_ARG4(regs));
+ UPT_SYSCALL_NR(®s->regs),
+ UPT_SYSCALL_ARG1(®s->regs),
+ UPT_SYSCALL_ARG2(®s->regs),
+ UPT_SYSCALL_ARG3(®s->regs),
+ UPT_SYSCALL_ARG4(®s->regs));
}
Index: linux-2.6.21-mm/fs/hostfs/hostfs_kern.c
===================================================================
--- linux-2.6.21-mm.orig/fs/hostfs/hostfs_kern.c 2007-03-27 12:25:11.000000000 -0400
+++ linux-2.6.21-mm/fs/hostfs/hostfs_kern.c 2007-03-27 12:34:31.000000000 -0400
@@ -20,7 +20,6 @@
#include "hostfs.h"
#include "kern_util.h"
#include "kern.h"
-#include "user_util.h"
#include "init.h"
struct hostfs_inode_info {
^ permalink raw reply [flat|nested] 2+ messages in thread
* [uml-devel] [PATCH 2/6] UML - fix compilation problems
@ 2007-03-27 18:27 ` Jeff Dike
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Dike @ 2007-03-27 18:27 UTC (permalink / raw)
To: Andrew Morton; +Cc: LKML, uml-devel
Fix a few miscellaneous compilation problems -
an assignment with mismatched types in ldt.c
a missing include in mconsole.h which needs a definition of uml_pt_regs
when auditing is configured there are some mismatched types in ptrace.c
I missed removing an include of user_util.h in hostfs
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
--
arch/um/include/mconsole.h | 2 ++
arch/um/kernel/ptrace.c | 14 +++++++-------
arch/um/sys-i386/ldt.c | 3 ++-
fs/hostfs/hostfs_kern.c | 1 -
4 files changed, 11 insertions(+), 9 deletions(-)
Index: linux-2.6.21-mm/arch/um/sys-i386/ldt.c
===================================================================
--- linux-2.6.21-mm.orig/arch/um/sys-i386/ldt.c 2007-03-27 12:25:16.000000000 -0400
+++ linux-2.6.21-mm/arch/um/sys-i386/ldt.c 2007-03-27 12:28:26.000000000 -0400
@@ -394,7 +394,8 @@ static short * host_ldt_entries = NULL;
static void ldt_get_host_info(void)
{
long ret;
- struct ldt_entry * ldt, *tmp;
+ struct ldt_entry * ldt;
+ short *tmp;
int i, size, k, order;
spin_lock(&host_ldt_lock);
Index: linux-2.6.21-mm/arch/um/include/mconsole.h
===================================================================
--- linux-2.6.21-mm.orig/arch/um/include/mconsole.h 2007-03-27 12:25:10.000000000 -0400
+++ linux-2.6.21-mm/arch/um/include/mconsole.h 2007-03-27 12:29:28.000000000 -0400
@@ -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
Index: linux-2.6.21-mm/arch/um/kernel/ptrace.c
===================================================================
--- linux-2.6.21-mm.orig/arch/um/kernel/ptrace.c 2007-03-27 12:25:18.000000000 -0400
+++ linux-2.6.21-mm/arch/um/kernel/ptrace.c 2007-03-27 12:34:43.000000000 -0400
@@ -53,8 +53,8 @@ void do_syscall_trace(struct pt_regs *re
secure_computing(PT_REGS_SYSCALL_NR(regs));
if (unlikely(current->audit_context) && entryexit)
- audit_syscall_exit(AUDITSC_RESULT(UPT_SYSCALL_RET(regs)),
- UPT_SYSCALL_RET(regs));
+ audit_syscall_exit(AUDITSC_RESULT(UPT_SYSCALL_RET(®s->regs)),
+ UPT_SYSCALL_RET(®s->regs));
if (test_thread_flag(TIF_SYSCALL_TRACE))
tracehook_report_syscall(regs, entryexit);
@@ -66,9 +66,9 @@ void do_syscall_trace(struct pt_regs *re
if (unlikely(current->audit_context) && !entryexit)
audit_syscall_entry(HOST_AUDIT_ARCH,
- UPT_SYSCALL_NR(regs),
- UPT_SYSCALL_ARG1(regs),
- UPT_SYSCALL_ARG2(regs),
- UPT_SYSCALL_ARG3(regs),
- UPT_SYSCALL_ARG4(regs));
+ UPT_SYSCALL_NR(®s->regs),
+ UPT_SYSCALL_ARG1(®s->regs),
+ UPT_SYSCALL_ARG2(®s->regs),
+ UPT_SYSCALL_ARG3(®s->regs),
+ UPT_SYSCALL_ARG4(®s->regs));
}
Index: linux-2.6.21-mm/fs/hostfs/hostfs_kern.c
===================================================================
--- linux-2.6.21-mm.orig/fs/hostfs/hostfs_kern.c 2007-03-27 12:25:11.000000000 -0400
+++ linux-2.6.21-mm/fs/hostfs/hostfs_kern.c 2007-03-27 12:34:31.000000000 -0400
@@ -20,7 +20,6 @@
#include "hostfs.h"
#include "kern_util.h"
#include "kern.h"
-#include "user_util.h"
#include "init.h"
struct hostfs_inode_info {
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-03-27 18:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-03-27 18:27 [PATCH 2/6] UML - fix compilation problems Jeff Dike
2007-03-27 18:27 ` [uml-devel] " Jeff Dike
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.