Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de5fe76e authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[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: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4cffb7fa

arch/um/drivers/mconsole_kern.c

+0 −1
Original line number Diff line number Diff line
@@ -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"

arch/um/drivers/mconsole_user.c

+1 −1
Original line number Diff line number Diff line
@@ -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[] = {

arch/um/include/umid.h

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
/*

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

 */

arch/um/kernel/um_arch.c

+0 −1
Original line number Diff line number Diff line
@@ -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"

arch/um/kernel/umid.c

+3 −1
Original line number Diff line number Diff line
@@ -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);