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

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

uml: get declaration of simple_strtoul 



Include linux/kernel.h wherever simple_strtoul is used.  This kills a
compile warning in stderr_console.c and potential ones in the other files.

This also fixes a bunch of style violations in exitcode.c.

Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 49277b1c

arch/um/drivers/line.c

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * Licensed under the GPL

 */



#include "linux/kernel.h"

#include "linux/sched.h"

#include "linux/slab.h"

#include "linux/list.h"

arch/um/drivers/stderr_console.c

+1 −0
Original line number Diff line number Diff line 
#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/console.h>

arch/um/drivers/ubd_kern.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#define MAJOR_NR UBD_MAJOR

#define UBD_SHIFT 4



#include "linux/kernel.h"

#include "linux/module.h"

#include "linux/blkdev.h"

#include "linux/hdreg.h"

arch/um/kernel/exitcode.c

+17 −22
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * Licensed under the GPL

 */



#include "linux/kernel.h"

#include "linux/init.h"

#include "linux/ctype.h"

#include "linux/proc_fs.h"
@@ -24,11 +25,14 @@ static int read_proc_exitcode(char *page, char **start, off_t off, 
	val = uml_exitcode;

	len = sprintf(page, "%d\n", val);

	len -= off;

	if(len <= off+count) *eof = 1;

	if(len <= off+count)

		*eof = 1;

	*start = page + off;

	if(len > count) len = count;

	if(len < 0) len = 0;

	return(len);

	if(len > count)

		len = count;

	if(len < 0)

		len = 0;

	return len;

}



static int write_proc_exitcode(struct file *file, const char __user *buffer,
@@ -38,12 +42,14 @@ static int write_proc_exitcode(struct file *file, const char __user *buffer, 
	int tmp;



	if(copy_from_user(buf, buffer, count))

		return(-EFAULT);

		return -EFAULT;



	tmp = simple_strtol(buf, &end, 0);

	if((*end != '\0') && !isspace(*end))

		return(-EINVAL);

		return -EINVAL;



	uml_exitcode = tmp;

	return(count);

	return count;

}



static int make_proc_exitcode(void)
@@ -54,24 +60,13 @@ static int make_proc_exitcode(void) 
	if(ent == NULL){

		printk(KERN_WARNING "make_proc_exitcode : Failed to register "

		       "/proc/exitcode\n");

		return(0);

		return 0;

	}



	ent->read_proc = read_proc_exitcode;

	ent->write_proc = write_proc_exitcode;



	return(0);

	return 0;

}



__initcall(make_proc_exitcode);
 


/*

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

 */