From 9fb5a42bbe09549f4fa7b50cc57ce0a42a56dbc6 Mon Sep 17 00:00:00 2001 From: gord-fig Date: Wed, 17 Jul 2002 13:26:34 +0000 Subject: [PATCH] Tweak autogen.sh and Makefiles to be compatible with Automake 1.6.2. --- lustre/autogen.sh | 2 +- lustre/extN/Makefile.am | 2 +- lustre/ldlm/Makefile.am | 2 +- lustre/llite/Makefile.am | 2 +- lustre/lov/Makefile.am | 2 +- lustre/mdc/Makefile.am | 2 +- lustre/mds/Makefile.am | 2 +- lustre/obdclass/Makefile.am | 2 +- lustre/obdecho/Makefile.am | 2 +- lustre/obdfilter/Makefile.am | 2 +- lustre/osc/Makefile.am | 2 +- lustre/ost/Makefile.am | 2 +- lustre/patches/patch-2.4.18 | 41 ----------------------------------------- lustre/patches/patch-2.4.18-um | 41 +++++++++++++++++++++++++++++++++++++++++ lustre/ptlrpc/Makefile.am | 2 +- lustre/tests/Makefile.am | 4 ++-- lustre/utils/Makefile.am | 4 ++-- 17 files changed, 58 insertions(+), 58 deletions(-) create mode 100644 lustre/patches/patch-2.4.18-um diff --git a/lustre/autogen.sh b/lustre/autogen.sh index 2468998..24dd8bb 100644 --- a/lustre/autogen.sh +++ b/lustre/autogen.sh @@ -1,6 +1,6 @@ #!/bin/sh find . -type d -name .deps | xargs rm -rf -automake --add-missing && aclocal && +automake --add-missing && autoconf diff --git a/lustre/extN/Makefile.am b/lustre/extN/Makefile.am index c34c1cb..c2592b4 100644 --- a/lustre/extN/Makefile.am +++ b/lustre/extN/Makefile.am @@ -3,7 +3,7 @@ # This code is issued under the GNU General Public License. # See the file COPYING in this distribution -DEFS:=-DEXPORT_SYMTAB +DEFS=-DEXPORT_SYMTAB MODULE = extN modulefs_DATA = extN.o EXTRA_PROGRAMS = extN diff --git a/lustre/ldlm/Makefile.am b/lustre/ldlm/Makefile.am index bfc45d2..606c1dd 100644 --- a/lustre/ldlm/Makefile.am +++ b/lustre/ldlm/Makefile.am @@ -3,7 +3,7 @@ # This code is issued under the GNU General Public License. # See the file COPYING in this distribution -DEFS:= +DEFS= MODULE = ldlm modulefs_DATA = ldlm.o EXTRA_PROGRAMS = ldlm diff --git a/lustre/llite/Makefile.am b/lustre/llite/Makefile.am index 88aa73c..1838bd1 100644 --- a/lustre/llite/Makefile.am +++ b/lustre/llite/Makefile.am @@ -3,7 +3,7 @@ # This code is issued under the GNU General Public License. # See the file COPYING in this distribution -DEFS:= +DEFS= MODULE = llite modulefs_DATA = llite.o diff --git a/lustre/lov/Makefile.am b/lustre/lov/Makefile.am index 5d24fc4..f45ddd9 100644 --- a/lustre/lov/Makefile.am +++ b/lustre/lov/Makefile.am @@ -3,7 +3,7 @@ # This code is issued under the GNU General Public License. # See the file COPYING in this distribution -DEFS := +DEFS= MODULE = lov modulefs_DATA = lov.o diff --git a/lustre/mdc/Makefile.am b/lustre/mdc/Makefile.am index b4127414..48e416c 100644 --- a/lustre/mdc/Makefile.am +++ b/lustre/mdc/Makefile.am @@ -3,7 +3,7 @@ # This code is issued under the GNU General Public License. # See the file COPYING in this distribution -DEFS:= +DEFS= MODULE = mdc modulefs_DATA = mdc.o diff --git a/lustre/mds/Makefile.am b/lustre/mds/Makefile.am index 8d5a486..c3c8c8f 100644 --- a/lustre/mds/Makefile.am +++ b/lustre/mds/Makefile.am @@ -3,7 +3,7 @@ # This code is issued under the GNU General Public License. # See the file COPYING in this distribution -DEFS:= +DEFS= MODULE = mds modulefs_DATA = mds.o mds_extN.o # mds_ext2.o mds_ext3.o diff --git a/lustre/obdclass/Makefile.am b/lustre/obdclass/Makefile.am index 01eed46..b006a08 100644 --- a/lustre/obdclass/Makefile.am +++ b/lustre/obdclass/Makefile.am @@ -1,4 +1,4 @@ -DEFS:= +DEFS= MODULE = obdclass modulefs_DATA = obdclass.o EXTRA_PROGRAMS = obdclass diff --git a/lustre/obdecho/Makefile.am b/lustre/obdecho/Makefile.am index bd6308f..7f7a4b8 100644 --- a/lustre/obdecho/Makefile.am +++ b/lustre/obdecho/Makefile.am @@ -3,7 +3,7 @@ # This code is issued under the GNU General Public License. # See the file COPYING in this distribution -DEFS:= +DEFS= MODULE = obdecho modulefs_DATA = obdecho.o EXTRA_PROGRAMS = obdecho diff --git a/lustre/obdfilter/Makefile.am b/lustre/obdfilter/Makefile.am index 054cb16..2f545ee 100644 --- a/lustre/obdfilter/Makefile.am +++ b/lustre/obdfilter/Makefile.am @@ -3,7 +3,7 @@ # This code is issued under the GNU General Public License. # See the file COPYING in this distribution -DEFS:= +DEFS= MODULE = obdfilter modulefs_DATA = obdfilter.o EXTRA_PROGRAMS = obdfilter diff --git a/lustre/osc/Makefile.am b/lustre/osc/Makefile.am index 4fd645b..45253da 100644 --- a/lustre/osc/Makefile.am +++ b/lustre/osc/Makefile.am @@ -3,7 +3,7 @@ # This code is issued under the GNU General Public License. # See the file COPYING in this distribution -DEFS:= +DEFS= MODULE = osc modulefs_DATA = osc.o diff --git a/lustre/ost/Makefile.am b/lustre/ost/Makefile.am index 507f667..29b0c30 100644 --- a/lustre/ost/Makefile.am +++ b/lustre/ost/Makefile.am @@ -3,7 +3,7 @@ # This code is issued under the GNU General Public License. # See the file COPYING in this distribution -DEFS:= +DEFS= MODULE = ost modulefs_DATA = ost.o EXTRA_PROGRAMS = ost diff --git a/lustre/patches/patch-2.4.18 b/lustre/patches/patch-2.4.18 index f0ab311..658124b 100644 --- a/lustre/patches/patch-2.4.18 +++ b/lustre/patches/patch-2.4.18 @@ -13,47 +13,6 @@ int do_check_pgt_cache (int low, int high) { ---- lum-pristine/arch/um/kernel/mem.c Sat Jul 13 13:20:13 2002 -+++ lum/arch/um/kernel/mem.c Thu Jul 4 10:04:25 2002 -@@ -527,6 +527,22 @@ - return(phys_mem_map(pte_val(pte))); - } - -+struct page *check_get_page(unsigned long kaddr) -+{ -+ struct page *page; -+ struct mem_region *mr; -+ unsigned long phys = __pa(kaddr); -+ unsigned int n = phys_region_index(phys); -+ -+ if(regions[n] == NULL) -+ return NULL; -+ -+ mr = regions[n]; -+ page = (struct page *) mr->mem_map; -+ return page + ((phys_addr(phys)) >> PAGE_SHIFT); -+} -+ -+ - struct mem_region *page_region(struct page *page, int *index_out) - { - int i; -@@ -542,12 +558,14 @@ - return(region); - } - } -- panic("No region found for page"); -+//panic("No region found for page"); - return(NULL); - } - - struct page *page_mem_map(struct page *page) - { -+ if (!page_region(page, NULL)) -+ return NULL; - return((struct page *) page_region(page, NULL)->mem_map); - } - --- lum-pristine/arch/i386/mm/init.c Fri Dec 21 10:41:53 2001 +++ lum/arch/i386/mm/init.c Thu Jul 4 10:04:25 2002 @@ -43,6 +43,12 @@ diff --git a/lustre/patches/patch-2.4.18-um b/lustre/patches/patch-2.4.18-um new file mode 100644 index 0000000..f229a09 --- /dev/null +++ b/lustre/patches/patch-2.4.18-um @@ -0,0 +1,41 @@ +--- lum-pristine/arch/um/kernel/mem.c Sat Jul 13 13:20:13 2002 ++++ lum/arch/um/kernel/mem.c Thu Jul 4 10:04:25 2002 +@@ -527,6 +527,22 @@ + return(phys_mem_map(pte_val(pte))); + } + ++struct page *check_get_page(unsigned long kaddr) ++{ ++ struct page *page; ++ struct mem_region *mr; ++ unsigned long phys = __pa(kaddr); ++ unsigned int n = phys_region_index(phys); ++ ++ if(regions[n] == NULL) ++ return NULL; ++ ++ mr = regions[n]; ++ page = (struct page *) mr->mem_map; ++ return page + ((phys_addr(phys)) >> PAGE_SHIFT); ++} ++ ++ + struct mem_region *page_region(struct page *page, int *index_out) + { + int i; +@@ -542,12 +558,14 @@ + return(region); + } + } +- panic("No region found for page"); ++//panic("No region found for page"); + return(NULL); + } + + struct page *page_mem_map(struct page *page) + { ++ if (!page_region(page, NULL)) ++ return NULL; + return((struct page *) page_region(page, NULL)->mem_map); + } + diff --git a/lustre/ptlrpc/Makefile.am b/lustre/ptlrpc/Makefile.am index e98189e..33a0734 100644 --- a/lustre/ptlrpc/Makefile.am +++ b/lustre/ptlrpc/Makefile.am @@ -3,7 +3,7 @@ # This code is issued under the GNU General Public License. # See the file COPYING in this distribution -DEFS:= +DEFS= MODULE = ptlrpc modulefs_DATA = ptlrpc.o diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am index 68c2ce8..67b4b41 100644 --- a/lustre/tests/Makefile.am +++ b/lustre/tests/Makefile.am @@ -1,5 +1,5 @@ -DEFS:= -CPPFLAGS := -I. -I$(PORTALS)/include -I$(top_srcdir)/include -D_LARGEFILE64_SOURCE +DEFS= +CPPFLAGS = -I. -I$(PORTALS)/include -I$(top_srcdir)/include -D_LARGEFILE64_SOURCE CFLAGS := -g -Wall # LDADD = -lldap # LDADD := -lreadline -ltermcap # -lefence diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am index 72f91da..3ec0fbc 100644 --- a/lustre/utils/Makefile.am +++ b/lustre/utils/Makefile.am @@ -1,9 +1,9 @@ -DEFS:= +DEFS= CFLAGS:=-g -I. -I/usr/include/libxml2 -I/usr/include/glib-1.2 -I$(PORTALS)/include \ -I/usr/lib/glib/include -I$(srcdir)/../include -Wall KFLAGS:= -CPPFLAGS := +CPPFLAGS = LDADD := -lreadline -lncurses -lxml2 # -lefence sbin_PROGRAMS = obdctl lctl obdctl_SOURCES = parser.c obdctl.c parser.h -- 1.8.3.1