kdump-update-20050404
authorGarry Zacheiss <zacheiss@mit.edu>
Mon, 4 Apr 2005 08:34:58 +0000 (08:34 +0000)
committerDerrick Brashear <shadow@dementia.org>
Mon, 4 Apr 2005 08:34:58 +0000 (08:34 +0000)
make kdump build again

Makefile.in
src/venus/Makefile.in
src/venus/kdump.c

index 09c946b..62af38e 100644 (file)
@@ -129,7 +129,7 @@ comerr: util
 
 cmd: comerr
        @case ${SYS_NAME} in \
-       sgi_6* | sun*_5[789] | hp_ux11* | ia64_hpux* | sparc64_linux* | alpha_linux* ) \
+       sgi_6* | sun*_5[789] | sun*_510 | hp_ux11* | ia64_hpux* | sparc64_linux* | alpha_linux* ) \
                ${COMPILE_PART1} cmd ${COMPILE_PART2}64 ;; \
        *) \
                ${COMPILE_PART1} cmd ${COMPILE_PART2} ;; \
index 1f08ca3..4957648 100644 (file)
@@ -180,7 +180,7 @@ kdump: kdump.o
 kdump64: 
        -set -x; \
        case ${SYS_NAME} in \
-       sun4x_5[789] | hp_ux11* |sunx86_5[789] )  \
+       sun4x_5[789] | sun4x_510 | hp_ux11* | sunx86_5[789] | sunx86_510 )  \
                $(MAKE) kdump64.o ; \
                ${CC} ${XCFLAGS64} -o kdump64 kdump64.o ${TOP_LIBDIR}/libcmd64.a ${XLIBELFA} ${XLIBKVM} ${XLIBS} ;; \
        esac
@@ -230,7 +230,7 @@ kdump.o: kdump.c ${INCLS} AFS_component_version_number.c
 kdump64.o : kdump.c ${INCLS} AFS_component_version_number.c
        -set -x; \
        case ${SYS_NAME} in \
-       sun4x_5[789] | hp_ux11* |sunx86_5[789] ) \
+       sun4x_5[789] | sun4x_510 | hp_ux11* | sunx86_5[789] | sunx86_510 ) \
                ${CC} ${KERN_DBG} ${KERN_OPTMZ} -I${TOP_SRCDIR} -I${TOP_INCDIR}/afs \
                -I${TOP_OBJDIR}/src/config -I${TOP_OBJDIR}/src -I${TOP_INCDIR} ${XCFLAGS64} \
                -o kdump64.o -c ${srcdir}/kdump.c ;; \
@@ -278,9 +278,9 @@ ${DEST}/etc/kdump: kdump-build
                for f in kdump.IP??; \
                        do ${INSTALL} -s $$f ${DEST}/etc/$$f || exit $$? ; \
                done ;; \
-       sun*_5[789] ) \
+       sun*_5[789] | sun*_510 ) \
                ${INSTALLex} -f ${srcdir}/kdump.sh.solaris7 ${DEST}/etc/kdump; \
-               ${INSTALL} -s -f $? $@;; \
+               ${INSTALL} -s -f ${srcdir}/kdump ${DEST}/etc/kdump32;; \
        *alpha_linux* ) \
                ${INSTALLex} -f ${srcdir}/kdump.sh.linux ${DEST}/etc/kdump; \
                ${INSTALL} -s kdump-alpha_linux-${LINUX_VERSION} $@ ;; \
@@ -356,7 +356,7 @@ ${DESTDIR}${sbindir}/kdump: kdump-build
                for f in kdump.IP??; \
                        do ${INSTALL} -s $$f ${DESTDIR}${sbindir}/$$f || exit $$? ; \
                done ;; \
-       sun*_5[789] ) \
+       sun*_5[789] | sun*_510 ) \
                ${INSTALLex} -f kdump.sh.solaris7 ${DESTDIR}${sbindir}/kdump32; \
                ${INSTALL} -s -f $? $@;; \
        *linux* ) \
index c44ad92..0251aa8 100644 (file)
@@ -186,8 +186,6 @@ typedef struct adaptive_mutex2 adaptive_mutex2_t;
 #endif
 #endif
 
-#include <sys/file.h>
-
 #ifdef AFS_SGI62_ENV
 #include <sys/fcntl.h>
 #ifndef L_SET
@@ -205,6 +203,10 @@ typedef struct adaptive_mutex2 adaptive_mutex2_t;
 #include <sys/socket.h>
 #endif
 
+#ifndef AFS_LINUX26_ENV
+#include <sys/file.h>
+#endif
+
 /*
  * On SGIs, when _KERNEL is defined, <netinet/in.h> declares inet_addr()
  * in a way that conflicts with the declaration in <arpa/inet.h>.
@@ -253,7 +255,9 @@ typedef struct adaptive_mutex2 adaptive_mutex2_t;
 #undef LONG_MAX
 #undef ULONG_MAX
 #define _LINUX_TIME_H
+#ifndef AFS_LINUX26_ENV
 #define _LINUX_FCNTL_H
+#endif
 #ifdef AFS_IA64_LINUX24_ENV
 #define flock64  flock
 #endif /* AFS_IA64_LINUX24_ENV */
@@ -1835,7 +1839,7 @@ print_buffers(pnt)
        if (pnt)
            printf
                ("Buffer #%d:\tfid=%lu page=%d, accTime=%d,\n\tHash=%x, data=%x, lockers=%x, dirty=%d, hashI=%d\n",
-                i, bp->fid[0], bp->page, bp->accesstime, bp->hashNext,
+                i, bp->fid, bp->page, bp->accesstime, bp->hashNext,
                 bp->data, bp->lockers, bp->dirty, bp->hashIndex);
 #endif
        j++;
@@ -2994,7 +2998,7 @@ print_vcache(kmem, vep, ptr, pnt)
        }
     }
 #ifdef AFS_LINUX22_ENV
-    printf("\tflushcnt=%d, mapcnt=%d\n", vep->flushcnt, vep->mapcnt);
+    printf("\tmapcnt=%d\n", vep->mapcnt);
 #endif
 }