dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[PATCH] uml: umid tidying 

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>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jeff Dike 2007-02-10 01:44:25 -08:00 committed by Linus Torvalds
parent 4cffb7fa69
commit de5fe76e43
6 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/um/drivers/mconsole_kern.c
View File

@ -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"

2
arch/um/drivers/mconsole_user.c
View File

@ -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[] = {

22
arch/um/include/umid.h
View File

@ -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:
*/

1
arch/um/kernel/um_arch.c
View File

@ -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"

4
arch/um/kernel/umid.c
View File

@ -16,8 +16,10 @@ static int __init set_umid_arg(char *name, int *add)
{
int err;
if(umid_inited)
if(umid_inited){
printf("umid already set\n");
return 0;
}
*add = 0;
err = set_umid(name);

3
arch/um/os-Linux/umid.c
View File

@ -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)