The patch titled
arch/um/kernel/um_arch.c: some small improvements
has been removed from the -mm tree. Its filename was
arch-um-kernel-um_archc-some-small-improvements.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: arch/um/kernel/um_arch.c: some small improvements
From: WANG Cong <xiyou.wangcong@xxxxxxxxx>
Make some small improvements for arch/um/kernel/um_arch.c.
Signed-off-by: WANG Cong <xiyou.wangcong@xxxxxxxxx>
Acked-by: Jeff Dike <jdike@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/um/kernel/um_arch.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff -puN arch/um/kernel/um_arch.c~arch-um-kernel-um_archc-some-small-improvements arch/um/kernel/um_arch.c
--- a/arch/um/kernel/um_arch.c~arch-um-kernel-um_archc-some-small-improvements
+++ a/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 *
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 **a
{
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++) {
_
Patches currently in -mm which might be from xiyou.wangcong@xxxxxxxxx are
origin.patch
remove-the-macro-get_personality.patch
elf-fix-shadowed-variables-in-fs-binfmt_elfc.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
