From 4eb754c2504df7543221655dd6994d7e408f88fc Mon Sep 17 00:00:00 2001 From: alex_tomas Date: Tue, 13 May 2003 19:07:38 +0000 Subject: [PATCH] - applying uml-2.4.20-4 to vanilla 2.4.20 makes kernel non-compilable for i386 --- lustre/kernel_patches/patches/uml-patch-2.4.20-4.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lustre/kernel_patches/patches/uml-patch-2.4.20-4.patch b/lustre/kernel_patches/patches/uml-patch-2.4.20-4.patch index b35fee0..06d0fff 100644 --- a/lustre/kernel_patches/patches/uml-patch-2.4.20-4.patch +++ b/lustre/kernel_patches/patches/uml-patch-2.4.20-4.patch @@ -39356,3 +39356,16 @@ diff -Naur -X ../exclude-files orig/mm/slab.c um/mm/slab.c seq_printf(m, "%-17s %6lu %6lu %6u %4lu %4lu %4u", name, active_objs, num_objs, cachep->objsize, +diff -puNr origin/arch/i386/kernel/sys_i386.c linux/arch/i386/kernel/sys_i386.c +--- origin/arch/i386/kernel/sys_i386.c 2001-03-19 23:35:09.000000000 +0300 ++++ linux/arch/i386/kernel/sys_i386.c 2003-05-04 11:44:54.000000000 +0400 +@@ -56,7 +56,7 @@ static inline long do_mmap2( + } + + down_write(¤t->mm->mmap_sem); +- error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff); ++ error = do_mmap_pgoff(current->mm, file, addr, len, prot, flags, pgoff); + up_write(¤t->mm->mmap_sem); + + if (file) + -- 1.8.3.1