This removes two now unused files and a couple of unused functions. The files
were removed by quilt add $file; rm $file; quilt refresh. If that doesn't
do it, I don't know what to do :-)
Signed-off-by: Jeff Dike <[email protected]>
Index: linux-2.6.11/arch/um/kernel/initrd_kern.c
===================================================================
--- linux-2.6.11.orig/arch/um/kernel/initrd_kern.c 2005-05-26 17:15:14.000000000 -0400
+++ linux-2.6.11/arch/um/kernel/initrd_kern.c 2003-09-15 09:40:47.000000000 -0400
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2000, 2001, 2002 Jeff Dike ([email protected])
- * 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:
- */
Index: linux-2.6.11/arch/um/kernel/initrd_user.c
===================================================================
--- linux-2.6.11.orig/arch/um/kernel/initrd_user.c 2005-05-26 17:15:14.000000000 -0400
+++ linux-2.6.11/arch/um/kernel/initrd_user.c 2003-09-15 09:40:47.000000000 -0400
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2000, 2001 Jeff Dike ([email protected])
- * 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:
- */
Index: linux-2.6.11/arch/um/kernel/process_kern.c
===================================================================
--- linux-2.6.11.orig/arch/um/kernel/process_kern.c 2005-05-26 17:25:35.000000000 -0400
+++ linux-2.6.11/arch/um/kernel/process_kern.c 2005-05-26 17:30:15.000000000 -0400
@@ -55,18 +55,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;
@@ -213,11 +201,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)
{
@@ -345,11 +328,6 @@ char *uml_strdup(char *string)
return kstrdup(string, GFP_KERNEL);
}
-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));
@@ -476,15 +454,3 @@ unsigned long arch_align_stack(unsigned
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:
- */
On Friday 27 May 2005 00:30, Jeff Dike wrote:
> This removes two now unused files and a couple of unused functions. The
> files were removed by quilt add $file; rm $file; quilt refresh. If that
> doesn't do it, I don't know what to do :-)
Be careful with this patch, since from the header timestamp I guess it won't
remove the file... do it by hand yourself when committing it.
> Signed-off-by: Jeff Dike <[email protected]>
> Index: linux-2.6.11/arch/um/kernel/initrd_kern.c
> ===================================================================
> --- linux-2.6.11.orig/arch/um/kernel/initrd_kern.c 2005-05-26
> 17:15:14.000000000 -0400 +++
> linux-2.6.11/arch/um/kernel/initrd_kern.c 2003-09-15 09:40:47.000000000
This should be 1970 to remove the file IIRC.
> Index: linux-2.6.11/arch/um/kernel/initrd_user.c
> ===================================================================
> --- linux-2.6.11.orig/arch/um/kernel/initrd_user.c 2005-05-26
> 17:15:14.000000000 -0400 +++
> linux-2.6.11/arch/um/kernel/initrd_user.c 2003-09-15 09:40:47.000000000
> -0400 @@ -1,46 +0,0 @@
Same for this.
--
Paolo Giarrusso, aka Blaisorblade
Skype user "PaoloGiarrusso"
Linux registered user n. 292729
http://www.user-mode-linux.org/~blaisorblade
___________________________________
Yahoo! Messenger: chiamate gratuite in tutto il mondo
http://it.beta.messenger.yahoo.com