mirror of
https://github.com/torvalds/linux
synced 2024-09-23 21:07:52 +00:00
edea138584
Tidy kern_util.h. It turns out that most of the function declarations aren't used, so they can go away. os.h no longer includes kern_util.h, so files which got it through os.h now need to include it directly. A number of other files never needed it, so these includes are deleted. The structure which was used to pass signal handlers from the kernel side to the userspace side is gone. Instead, the handlers are declared here, and used directly from libc code. This allows arch/um/os-Linux/trap.c to be deleted, with its remnants being moved to arch/um/os-Linux/skas/trap.c. arch/um/os-Linux/tty.c had its inclusions changed, and it needed some style attention, so it got tidied. Signed-off-by: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
75 lines
1.4 KiB
C
75 lines
1.4 KiB
C
/*
|
|
* 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 "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"
|
|
);
|
|
|
|
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;
|
|
}
|