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

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

[PATCH] uml: remove unused code 



This removes two now unused files and a couple of unused functions.

Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 92515da7

arch/um/kernel/initrd_kern.c

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

 * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)

 * Licensed under the GPL

 */



#include "linux/init.h"

#include "linux/bootmem.h"

#include "linux/initrd.h"

#include "asm/types.h"

#include "user_util.h"

#include "kern_util.h"

#include "initrd.h"

#include "init.h"

#include "os.h"



/* Changed by uml_initrd_setup, which is a setup */

static char *initrd __initdata = NULL;



static int __init read_initrd(void)

{

	void *area;

	long long size;

	int err;



	if(initrd == NULL) return 0;

	err = os_file_size(initrd, &size);

	if(err) return 0;

	area = alloc_bootmem(size);

	if(area == NULL) return 0;

	if(load_initrd(initrd, area, size) == -1) return 0;

	initrd_start = (unsigned long) area;

	initrd_end = initrd_start + size;

	return 0;

}



__uml_postsetup(read_initrd);



static int __init uml_initrd_setup(char *line, int *add)

{

	initrd = line;

	return 0;

}



__uml_setup("initrd=", uml_initrd_setup, 

"initrd=<initrd image>\n"

"    This is used to boot UML from an initrd image.  The argument is the\n"

"    name of the file containing the image.\n\n"

);



/*

 * 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/initrd_user.c

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

 * Copyright (C) 2000, 2001 Jeff Dike (jdike@karaya.com)

 * Licensed under the GPL

 */



#include <unistd.h>

#include <sys/types.h>

#include <sys/stat.h>

#include <errno.h>



#include "user_util.h"

#include "kern_util.h"

#include "user.h"

#include "initrd.h"

#include "os.h"



int load_initrd(char *filename, void *buf, int size)

{

	int fd, n;



	fd = os_open_file(filename, of_read(OPENFLAGS()), 0);

	if(fd < 0){

		printk("Opening '%s' failed - err = %d\n", filename, -fd);

		return(-1);

	}

	n = os_read_file(fd, buf, size);

	if(n != size){

		printk("Read of %d bytes from '%s' failed, err = %d\n", size,

		       filename, -n);

		return(-1);

	}



	os_close_file(fd);

	return(0);

}



/*

 * 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/process_kern.c

+0 −34
Original line number Diff line number Diff line
@@ -54,18 +54,6 @@ 
 */

struct cpu_task cpu_tasks[NR_CPUS] = { [0 ... NR_CPUS - 1] = { -1, NULL } };



struct task_struct *get_task(int pid, int require)

{

        struct task_struct *ret;



        read_lock(&tasklist_lock);

	ret = find_task_by_pid(pid);

        read_unlock(&tasklist_lock);



        if(require && (ret == NULL)) panic("get_task couldn't find a task\n");

        return(ret);

}



int external_pid(void *t)

{

	struct task_struct *task = t ? t : current;
@@ -210,11 +198,6 @@ int page_size(void) 
	return(PAGE_SIZE);

}



unsigned long page_mask(void)

{

	return(PAGE_MASK);

}



void *um_virt_to_phys(struct task_struct *task, unsigned long addr, 

		      pte_t *pte_out)

{
@@ -347,11 +330,6 @@ char *uml_strdup(char *string) 
	return(new);

}



void *get_init_task(void)

{

	return(&init_thread_union.thread_info.task);

}



int copy_to_user_proc(void __user *to, void *from, int size)

{

	return(copy_to_user(to, from, size));
@@ -478,15 +456,3 @@ unsigned long arch_align_stack(unsigned long sp) 
	return sp & ~0xf;

}

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

 */