[uml-devel] make highmem work again in 2.5 ( for bk-current)

[Oleg D. <gr...@na...>]

Hello!

    Since now i386 architecture uninlined highmem stuff, we seems to need
    this patch to get highmem support back. Compiles and runs fine both
    with and without highmem support for me with this patch.

Bye,
    Oleg

===== arch/um/kernel/ksyms.c 1.4 vs edited =====
--- 1.4/arch/um/kernel/ksyms.c	Thu Oct 17 11:29:34 2002
+++ edited/arch/um/kernel/ksyms.c	Thu Oct 17 14:13:39 2002
@@ -3,6 +3,7 @@
 #include "linux/string.h"
 #include "linux/smp_lock.h"
 #include "linux/spinlock.h"
+#include <linux/highmem.h>
 #include "asm/current.h"
 #include "asm/delay.h"
 #include "asm/processor.h"
@@ -72,3 +73,12 @@
 EXPORT_SYMBOL_NOVERS(__read_lock_failed);
 
 #endif
+
+#ifdef CONFIG_HIGHMEM
+EXPORT_SYMBOL(kmap);
+EXPORT_SYMBOL(kunmap);
+EXPORT_SYMBOL(kmap_atomic);
+EXPORT_SYMBOL(kunmap_atomic);
+EXPORT_SYMBOL(kmap_atomic_to_page);
+#endif
+
===== arch/um/sys-i386/Makefile 1.4 vs edited =====
--- 1.4/arch/um/sys-i386/Makefile	Thu Oct 17 11:31:25 2002
+++ edited/arch/um/sys-i386/Makefile	Thu Oct 17 14:22:28 2002
@@ -1,12 +1,14 @@
 obj-y = bugs.o checksum.o extable.o fault.o ksyms.o ldt.o \
 	ptrace.o ptrace_user.o semaphore.o sigcontext.o syscalls.o sysrq.o
 
+obj-$(CONFIG_HIGHMEM) += highmem.o
+
 export-objs = ksyms.o
 
 USER_OBJS := bugs.o ptrace_user.o sigcontext.o fault.o
 USER_OBJS := $(foreach file,$(USER_OBJS),arch/um/sys-i386/$(file))
 
-SYMLINKS = semaphore.c checksum.S extable.c
+SYMLINKS = semaphore.c checksum.S extable.c highmem.c
 
 include $(TOPDIR)/Rules.make
 
@@ -25,6 +27,9 @@
 	-rm -f $@
 	-ln -s $(TOPDIR)/arch/i386/mm/$(notdir $@) $@
 
+arch/um/sys-i386/highmem.c:
+	-rm -f $@
+	-ln -s $(TOPDIR)/arch/i386/mm/$(notdir $@) $@
 clean:
 	$(MAKE) -C util clean