The patch titled
uml: remove code controlled by non-existent config option
has been removed from the -mm tree. Its filename was
uml-remove-code-controlled-by-non-existent-config-option.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: uml: remove code controlled by non-existent config option
From: Jeff Dike <jdike@xxxxxxxxxxx>
CONFIG_HOST_TASK_SIZE doesn't exist any more.
Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/um/kernel/skas/mem.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff -puN arch/um/kernel/skas/mem.c~uml-remove-code-controlled-by-non-existent-config-option arch/um/kernel/skas/mem.c
--- a/arch/um/kernel/skas/mem.c~uml-remove-code-controlled-by-non-existent-config-option
+++ a/arch/um/kernel/skas/mem.c
@@ -14,13 +14,9 @@ unsigned long set_task_sizes_skas(unsign
unsigned long host_task_size = ROUND_4M((unsigned long)
&host_task_size);
-#ifdef CONFIG_HOST_TASK_SIZE
- *host_size_out = ROUND_4M(CONFIG_HOST_TASK_SIZE);
- *task_size_out = CONFIG_HOST_TASK_SIZE;
-#else
if (!skas_needs_stub)
*task_size_out = host_task_size;
else *task_size_out = CONFIG_STUB_START & PGDIR_MASK;
-#endif
+
return host_task_size;
}
_
Patches currently in -mm which might be from jdike@xxxxxxxxxxx are
origin.patch
uml-fix-prototypes.patch
dynamic-kernel-command-line-common.patch
dynamic-kernel-command-line-um.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
