[PATCH 4/7] UML - umid tidying

Jeff Dike
2007-02-07T19:55:41Z

Add an error message when two umids are put on the command line.

umid.h is kind of pointless since it only declares one thing, and that
is already declared in os.h.

Commented the lack of locking of some data in os-Linux/umid.h.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
--
arch/um/drivers/mconsole_kern.c | 1 -
arch/um/drivers/mconsole_user.c | 2 +-
arch/um/include/umid.h | 22 ----------------------
arch/um/kernel/um_arch.c | 1 -
arch/um/kernel/umid.c | 4 +++-
arch/um/os-Linux/umid.c | 3 ++-
6 files changed, 6 insertions(+), 27 deletions(-)

Index: linux-2.6.18-mm/arch/um/kernel/umid.c
===================================================================
--- linux-2.6.18-mm.orig/arch/um/kernel/umid.c 2007-01-09 17:08:56.000000000 -0500
+++ linux-2.6.18-mm/arch/um/kernel/umid.c 2007-01-09 17:09:52.000000000 -0500
@@ -16,8 +16,10 @@ static int __init set_umid_arg(char *nam
{
int err;

- if(umid_inited)
+ if(umid_inited){
+ printf("umid already set\n");
return 0;
+ }

*add = 0;
err = set_umid(name);
Index: linux-2.6.18-mm/arch/um/drivers/mconsole_kern.c
===================================================================
--- linux-2.6.18-mm.orig/arch/um/drivers/mconsole_kern.c 2007-01-09 17:25:15.000000000 -0500
+++ linux-2.6.18-mm/arch/um/drivers/mconsole_kern.c 2007-01-10 12:37:00.000000000 -0500
@@ -33,7 +33,6 @@
#include "irq_user.h"
#include "init.h"
#include "os.h"
-#include "umid.h"
#include "irq_kern.h"
#include "choose-mode.h"

Index: linux-2.6.18-mm/arch/um/drivers/mconsole_user.c
===================================================================
--- linux-2.6.18-mm.orig/arch/um/drivers/mconsole_user.c 2007-01-09 17:25:15.000000000 -0500
+++ linux-2.6.18-mm/arch/um/drivers/mconsole_user.c 2007-01-10 12:30:17.000000000 -0500
@@ -16,7 +16,7 @@
#include "user.h"
#include "sysdep/ptrace.h"
#include "mconsole.h"
-#include "umid.h"
+#include "os.h"
#include "user_util.h"

static struct mconsole_command commands[] = {
Index: linux-2.6.18-mm/arch/um/include/umid.h
===================================================================
--- linux-2.6.18-mm.orig/arch/um/include/umid.h 2006-06-17 21:49:35.000000000 -0400
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2001 Jeff Dike (jdike@karaya.com)
- * Licensed under the GPL
- */
-
-#ifndef __UMID_H__
-#define __UMID_H__
-
-extern int umid_file_name(char *name, char *buf, int len);
-
-#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:
- */
Index: linux-2.6.18-mm/arch/um/kernel/um_arch.c
===================================================================
--- linux-2.6.18-mm.orig/arch/um/kernel/um_arch.c 2007-01-09 17:25:16.000000000 -0500
+++ linux-2.6.18-mm/arch/um/kernel/um_arch.c 2007-01-10 12:36:46.000000000 -0500
@@ -30,7 +30,6 @@
#include "kern.h"
#include "mem_user.h"
#include "mem.h"
-#include "umid.h"
#include "initrd.h"
#include "init.h"
#include "os.h"
Index: linux-2.6.18-mm/arch/um/os-Linux/umid.c
===================================================================
--- linux-2.6.18-mm.orig/arch/um/os-Linux/umid.c 2006-09-24 22:23:24.000000000 -0400
+++ linux-2.6.18-mm/arch/um/os-Linux/umid.c 2007-01-10 12:28:40.000000000 -0500
@@ -18,7 +18,7 @@
#define UMID_LEN 64

/* Changed by set_umid, which is run early in boot */
-char umid[UMID_LEN] = { 0 };
+static char umid[UMID_LEN] = { 0 };

/* Changed by set_uml_dir and make_uml_dir, which are run early in boot */
static char *uml_dir = UML_DIR;
@@ -235,6 +235,7 @@ int __init set_umid(char *name)
return 0;
}

+/* Changed in make_umid, which is called during early boot */
static int umid_setup = 0;

int __init make_umid(void)