summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjdike <jdike>2003-12-19 20:42:26 +0000
committerjdike <jdike>2003-12-19 20:42:26 +0000
commit496f1bd3879adf125ab7a1afd9638cd232ac365b (patch)
tree48c9c37e2905f024412f10aa76ce6161c3218e3f
parentf9362ee44c163bf443426573ddcf5e597348c627 (diff)
downloaduml-history-496f1bd3879adf125ab7a1afd9638cd232ac365b.tar.gz
Unbumped EXTRAVERSION.
-rw-r--r--arch/um/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile
index 6d01eaa..c2b9abf 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -25,7 +25,7 @@ ifneq ($(MAKEFILE-y),)
include $(addprefix $(ARCH_DIR)/,$(MAKEFILE-y))
endif
-EXTRAVERSION := $(EXTRAVERSION)-7um
+EXTRAVERSION := $(EXTRAVERSION)-1um
include/linux/version.h: arch/$(ARCH)/Makefile
@@ -57,8 +57,12 @@ LINKFLAGS += -r
LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc
+# These are needed for clean and mrproper, since in that case .config is not
+# included; the values here are meaningless
+
CONFIG_NEST_LEVEL ?= 0
CONFIG_KERNEL_HALF_GIGS ?= 0
+
SIZE = (($(CONFIG_NEST_LEVEL) + $(CONFIG_KERNEL_HALF_GIGS)) * 0x20000000)
# These aren't in Makefile-tt because they are needed in the !CONFIG_MODE_TT +