Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

uml: const and other tidying

Browse Source 
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: WANG Cong <xiyou.wangcong@gmail.com>
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>
This commit is contained in:
WANG Cong 2008-02-04 22:30:41 -08:00 committed by Linus Torvalds
parent 9226b83847
commit c0a9290ecf
7 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/um/drivers/ubd_kern.c
View File

@ -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);

2
arch/um/include/kern_util.h
View File

@ -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);

2
arch/um/kernel/mem.c
View File

@ -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.

4
arch/um/kernel/process.c
View File

@ -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);
}

2
arch/um/os-Linux/drivers/tuntap_user.c
View File

@ -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);

7
arch/um/os-Linux/mem.c
View File

@ -30,7 +30,7 @@ static char *tempdir = NULL;
static void __init find_tempdir(void)
{
char *dirs[] = { "TMP", "TEMP", "TMPDIR", NULL };
const char *dirs[] = { "TMP", "TEMP", "TMPDIR", NULL };
int i;
char *dir = NULL;
@ -59,9 +59,10 @@ static void __init find_tempdir(void)
* read the file as needed. If there's an error, -errno is returned;
* if the end of the file is reached, 0 is returned.
*/
static int next(int fd, char *buf, int size, char c)
static int next(int fd, char *buf, size_t size, char c)
{
int n, len;
ssize_t n;
size_t len;
char *ptr;
while((ptr = strchr(buf, c)) == NULL){

2
arch/um/os-Linux/sigio.c
View File

@ -407,7 +407,7 @@ static int async_pty(int master, int slave)
if((fcntl(slave, F_SETFL, flags | O_NONBLOCK) < 0))
return -errno;
return(0);
return 0;
}
static void __init check_one_sigio(void (*proc)(int, int))