From 73f375fa5c671b34203ba21c3c9fb3f05e6fe64d Mon Sep 17 00:00:00 2001 From: gord-fig Date: Thu, 18 Jul 2002 22:42:29 +0000 Subject: [PATCH] Add Phil's patch-2.4.18-um change. Add --with-linux and --with-portals as aliases for --enable-linuxdir and --enable-portalsdir. --- lustre/configure.in | 3 +++ lustre/patches/patch-2.4.18-um | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/lustre/configure.in b/lustre/configure.in index 2efaae8..e2a8141 100644 --- a/lustre/configure.in +++ b/lustre/configure.in @@ -30,6 +30,7 @@ bindir='${exec_prefix}/usr/bin' sbindir='${exec_prefix}/usr/sbin' linuxdir_def=/usr/src/linux +AC_ARG_WITH(linux, [ --with-linux[[=PATH]] set path to Linux source (default=/usr/src/linux)],enable_linuxdir="$with_linux", enable_linuxdir="$linuxdir_def") AC_ARG_ENABLE(linuxdir, [ --enable-linuxdir=[path] set path to Linux source (default=/usr/src/linux)],, enable_linuxdir=$linuxdir_def) LINUX=$enable_linuxdir @@ -41,6 +42,8 @@ KINCFLAGS='-I. -I$(top_srcdir)/include -I$(PORTALS)/include -I$(LINUX)/include' CPPFLAGS="$KINCFLAGS $ARCHCPPFLAGS" portalsdir_def='$(top_srcdir)/../portals' +AC_ARG_WITH(portals, [ --with-portals[[=PATH]] set path to Portals source (default=../portals)], enable_portalsdir="$with_portals", enable_portalsdir=$portalsdir_def) +PORTALS=$enable_portalsdir AC_ARG_ENABLE(portalsdir, [ --enable-portalsdir=[path] set path to Portals source (default=../portals)],, enable_portalsdir=$portalsdir_def) PORTALS=$enable_portalsdir AC_SUBST(PORTALS) diff --git a/lustre/patches/patch-2.4.18-um b/lustre/patches/patch-2.4.18-um index f229a09..e7e835f 100644 --- a/lustre/patches/patch-2.4.18-um +++ b/lustre/patches/patch-2.4.18-um @@ -39,3 +39,13 @@ return((struct page *) page_region(page, NULL)->mem_map); } +--- lum/arch/um/kernel/mem.c~ Wed Jul 17 11:23:15 2002 ++++ lum/arch/um/kernel/mem.c Wed Jul 17 11:28:48 2002 +@@ -582,7 +582,7 @@ + (addr <= region->start + region->len)) + return(mk_phys(addr - region->start, i)); + } +- panic("region_pa : no region for virtual address"); ++ //panic("region_pa : no region for virtual address"); + return(0); + } -- 1.8.3.1