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

Commit c0a9290e authored by WANG Cong's avatar WANG Cong Committed by Linus Torvalds
Browse files

uml: const and other tidying 



This patch also does some improvements for uml code.  Improvements include
dropping unnecessary cast, killing some unnecessary code and still some
constifying for pointers etc..

Signed-off-by: default avatarWANG Cong <xiyou.wangcong@gmail.com>
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 9226b838

arch/um/drivers/ubd_kern.c

+3 −3
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static int proc_ide_read_media(char *page, char **start, off_t off, int count, 
	return len;

}



static void make_ide_entries(char *dev_name)

static void make_ide_entries(const char *dev_name)

{

	struct proc_dir_entry *dir, *ent;

	char name[64];
@@ -244,7 +244,7 @@ static void make_ide_entries(char *dev_name) 
	ent->data = NULL;

	ent->read_proc = proc_ide_read_media;

	ent->write_proc = NULL;

	sprintf(name,"ide0/%s", dev_name);

	snprintf(name, sizeof(name), "ide0/%s", dev_name);

	proc_symlink(dev_name, proc_ide_root, name);

}
@@ -443,7 +443,7 @@ __uml_help(ubd_setup, 
"    cluster filesystem and inappropriate at almost all other times.\n\n"

);



static int udb_setup(char *str)

static int udb_setup(const char *str)

{

	printk("udb%s specified on command line is almost certainly a ubd -> "

	       "udb TYPO\n", str);

arch/um/include/kern_util.h

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ extern void do_uml_exitcalls(void); 
extern int attach_debugger(int idle_pid, int pid, int stop);

extern int config_gdb(char *str);

extern int remove_gdb(void);

extern char *uml_strdup(char *string);

extern char *uml_strdup(const char *string);

extern void unprotect_kernel_mem(void);

extern void protect_kernel_mem(void);

extern void uml_cleanup(void);

arch/um/kernel/mem.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static void setup_highmem(unsigned long highmem_start, 
void __init mem_init(void)

{

	/* clear the zero-page */

	memset((void *) empty_zero_page, 0, PAGE_SIZE);

	memset(empty_zero_page, 0, PAGE_SIZE);



	/* Map in the area just after the brk now that kmalloc is about

	 * to be turned on.

arch/um/kernel/process.c

+1 −3
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ unsigned long alloc_stack(int order, int atomic) 
	if (atomic)

		flags = GFP_ATOMIC;

	page = __get_free_pages(flags, order);

	if (page == 0)

		return 0;



	return page;

}
@@ -331,7 +329,7 @@ void do_uml_exitcalls(void) 
		(*call)();

}



char *uml_strdup(char *string)

char *uml_strdup(const char *string)

{

	return kstrdup(string, GFP_KERNEL);

}

arch/um/os-Linux/drivers/tuntap_user.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static int tuntap_open(void *data) 
		memset(&ifr, 0, sizeof(ifr));

		ifr.ifr_flags = IFF_TAP | IFF_NO_PI;

		strlcpy(ifr.ifr_name, pri->dev_name, sizeof(ifr.ifr_name));

		if (ioctl(pri->fd, TUNSETIFF, (void *) &ifr) < 0) {

		if (ioctl(pri->fd, TUNSETIFF, &ifr) < 0) {

			err = -errno;

			printk(UM_KERN_ERR "TUNSETIFF failed, errno = %d\n",

			       errno);