The patch titled
uml: reenable compilation of enable_timer, disabled by mistake
has been added to the -mm tree. Its filename is
uml-reenable-compilation-of-enable_timer-disabled-by-mistake.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: uml: reenable compilation of enable_timer, disabled by mistake
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
CONFIG_MODE_TT does not work there, the UML_ prefixed version must be used -
this causes a link-time failure when CONFIG_MODE_TT is enabled (i.e. always
here, never by Jeff).
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
Cc: Jeff Dike <jdike@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/um/os-Linux/time.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
diff -puN arch/um/os-Linux/time.c~uml-reenable-compilation-of-enable_timer-disabled-by-mistake arch/um/os-Linux/time.c
--- a/arch/um/os-Linux/time.c~uml-reenable-compilation-of-enable_timer-disabled-by-mistake
+++ a/arch/um/os-Linux/time.c
@@ -16,6 +16,7 @@
#include "process.h"
#include "kern_constants.h"
#include "os.h"
+#include "uml-config.h"
int set_interval(int is_virtual)
{
@@ -30,7 +31,7 @@ int set_interval(int is_virtual)
return 0;
}
-#ifdef CONFIG_MODE_TT
+#ifdef UML_CONFIG_MODE_TT
void enable_timer(void)
{
set_interval(1);
_
Patches currently in -mm which might be from blaisorblade@xxxxxxxx are
uml-mode_tt-is-bust.patch
fix-typo-in-memory-barrier-docs.patch
uml-remove-some-leftover-ppc-code.patch
uml-split-memory-allocation-prototypes-out-of-userh.patch
uml-fix-prototypes.patch
uml-make-execvp-safe-for-our-usage.patch
uml-code-convention-cleanup-of-a-file.patch
uml-reenable-compilation-of-enable_timer-disabled-by-mistake.patch
uml-use-defconfig_list-to-avoid-reading-hosts-config.patch
uml-cleanup-run_helper-api-to-fix-a-leak.patch
uml-kconfig-silence-warning.patch
uml-mmapper-remove-just-added-but-wrong-const-attribute.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
