From 1cd4c91f5912b428e85e964cf49c46bf4c17e4cc Mon Sep 17 00:00:00 2001 From: WANG Cong Date: Mon, 28 Apr 2008 02:13:52 -0700 Subject: [PATCH] --- yaml --- r: 94073 b: refs/heads/master c: 3af9c5bed1b8f284f3d7d479c77adf60ad059e91 h: refs/heads/master i: 94071: 24fc26be37d9468b6672e8cd336eb49fb972997d v: v3 --- [refs] | 2 +- trunk/arch/um/kernel/um_arch.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9c84cd508812..e1055be78192 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16a26ef5ad31b59c521bd9becccaee84c0157326 +refs/heads/master: 3af9c5bed1b8f284f3d7d479c77adf60ad059e91 diff --git a/trunk/arch/um/kernel/um_arch.c b/trunk/arch/um/kernel/um_arch.c index a6c1dd1cf5a1..56deed623446 100644 --- a/trunk/arch/um/kernel/um_arch.c +++ b/trunk/arch/um/kernel/um_arch.c @@ -115,7 +115,7 @@ static int have_root __initdata = 0; /* Set in uml_mem_setup and modified in linux_main */ long long physmem_size = 32 * 1024 * 1024; -static char *usage_string = +static const char *usage_string = "User Mode Linux v%s\n" " available at http://user-mode-linux.sourceforge.net/\n\n"; @@ -202,7 +202,7 @@ static void __init uml_checksetup(char *line, int *add) p = &__uml_setup_start; while (p < &__uml_setup_end) { - int n; + size_t n; n = strlen(p->str); if (!strncmp(line, p->str, n) && p->setup_func(line + n, add)) @@ -258,7 +258,8 @@ int __init linux_main(int argc, char **argv) { unsigned long avail, diff; unsigned long virtmem_size, max_physmem; - unsigned int i, add; + unsigned int i; + int add; char * mode; for (i = 1; i < argc; i++) {