From 1011a28ca88ffc0961f6bb42c8d1b4a0c883aa12 Mon Sep 17 00:00:00 2001 From: rread Date: Fri, 26 Jul 2002 16:54:56 +0000 Subject: [PATCH] - small include changes needed compile on powerpc --- lustre/archdep.m4 | 7 +++++++ lustre/include/linux/lustre_idl.h | 1 + lustre/include/linux/lustre_lib.h | 2 -- lustre/llite/super.c | 1 + lustre/lov/lov_obd.c | 1 + lustre/mdc/mdc_request.c | 1 + lustre/mds/handler.c | 2 ++ lustre/obdecho/echo.c | 5 +++-- lustre/obdfilter/filter.c | 1 + lustre/osc/osc_request.c | 1 + lustre/ost/ost_handler.c | 1 + lustre/ptlrpc/rpc.c | 1 + lustre/ptlrpc/service.c | 2 +- 13 files changed, 21 insertions(+), 5 deletions(-) diff --git a/lustre/archdep.m4 b/lustre/archdep.m4 index 9f7198d..eae4bf0 100644 --- a/lustre/archdep.m4 +++ b/lustre/archdep.m4 @@ -48,6 +48,13 @@ case ${host_cpu} in ;; + powerpc ) + AC_MSG_RESULT($host_cpu) + KCFLAGS='-Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -D__powerpc__ -fsigned-char -msoft-float -pipe -ffixed-r2 -Wno-uninitialized -mmultiple -mstring' + KCPPFLAGS='-D__KERNEL__' + MOD_LINK=elf32ppclinux +;; + *) AC_ERROR("Unknown Linux Platform: $host_cpu") esac diff --git a/lustre/include/linux/lustre_idl.h b/lustre/include/linux/lustre_idl.h index 8b470e8..1814325 100644 --- a/lustre/include/linux/lustre_idl.h +++ b/lustre/include/linux/lustre_idl.h @@ -31,6 +31,7 @@ # include #else # define __KERNEL__ +# include # include # undef __KERNEL__ # include diff --git a/lustre/include/linux/lustre_lib.h b/lustre/include/linux/lustre_lib.h index 60dd8b9..3bb73a0 100644 --- a/lustre/include/linux/lustre_lib.h +++ b/lustre/include/linux/lustre_lib.h @@ -25,8 +25,6 @@ #ifndef _LUSTRE_LIB_H #define _LUSTRE_LIB_H -#include - #ifndef __KERNEL__ # include #else diff --git a/lustre/llite/super.c b/lustre/llite/super.c index eb67f81..bb32159 100644 --- a/lustre/llite/super.c +++ b/lustre/llite/super.c @@ -15,6 +15,7 @@ #include #include #include +#include kmem_cache_t *ll_file_data_slab; extern struct address_space_operations ll_aops; diff --git a/lustre/lov/lov_obd.c b/lustre/lov/lov_obd.c index 75b225d..2cd84ab 100644 --- a/lustre/lov/lov_obd.c +++ b/lustre/lov/lov_obd.c @@ -22,6 +22,7 @@ #include #include #include +#include extern struct obd_device obd_dev[MAX_OBD_DEVICES]; diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c index e0b8a97..4116df1 100644 --- a/lustre/mdc/mdc_request.c +++ b/lustre/mdc/mdc_request.c @@ -28,6 +28,7 @@ #include #include #include +#include #define REQUEST_MINOR 244 diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c index c09a6188..b720eca 100644 --- a/lustre/mds/handler.c +++ b/lustre/mds/handler.c @@ -23,6 +23,8 @@ #include #include #include +#include + extern int mds_get_lovtgts(struct obd_device *obd, int tgt_count, uuid_t *uuidarray); extern int mds_get_lovdesc(struct obd_device *obd, struct lov_desc *desc); diff --git a/lustre/obdecho/echo.c b/lustre/obdecho/echo.c index 27c189a..0cd3708 100644 --- a/lustre/obdecho/echo.c +++ b/lustre/obdecho/echo.c @@ -11,8 +11,8 @@ * by Peter Braam */ -static char rcsid[] __attribute ((unused)) = "$Id: echo.c,v 1.17 2002/07/05 20:05:27 rread Exp $"; -#define OBDECHO_VERSION "$Revision: 1.17 $" +static char rcsid[] __attribute ((unused)) = "$Id: echo.c,v 1.18 2002/07/26 16:54:55 rread Exp $"; +#define OBDECHO_VERSION "$Revision: 1.18 $" #define EXPORT_SYMTAB @@ -23,6 +23,7 @@ static char rcsid[] __attribute ((unused)) = "$Id: echo.c,v 1.17 2002/07/05 20:0 #include #include #include +#include #include #define DEBUG_SUBSYSTEM S_ECHO diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c index 95d0f9b..4e1ec72 100644 --- a/lustre/obdfilter/filter.c +++ b/lustre/obdfilter/filter.c @@ -19,6 +19,7 @@ #include #include #include +#include extern struct obd_device obd_dev[MAX_OBD_DEVICES]; long filter_memory; diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c index d6c73d8..96dedd4 100644 --- a/lustre/osc/osc_request.c +++ b/lustre/osc/osc_request.c @@ -24,6 +24,7 @@ #include /* for mds_objid */ #include #include +#include static void osc_con2cl(struct lustre_handle *conn, struct ptlrpc_client **cl, struct ptlrpc_connection **connection, diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c index baa1252..d86e05f 100644 --- a/lustre/ost/ost_handler.c +++ b/lustre/ost/ost_handler.c @@ -37,6 +37,7 @@ #include #include #include +#include static int ost_destroy(struct ptlrpc_request *req) { diff --git a/lustre/ptlrpc/rpc.c b/lustre/ptlrpc/rpc.c index c8e268a..e0c9414 100644 --- a/lustre/ptlrpc/rpc.c +++ b/lustre/ptlrpc/rpc.c @@ -28,6 +28,7 @@ #include #include #include +#include extern int ptlrpc_init_portals(void); extern void ptlrpc_exit_portals(void); diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c index a1994997..6aa5f65 100644 --- a/lustre/ptlrpc/service.c +++ b/lustre/ptlrpc/service.c @@ -89,7 +89,7 @@ ptlrpc_init_svc(__u32 bufsize, int req_portal, int rep_portal, char *uuid, err = kportal_uuid_to_peer(uuid, &service->srv_self); if (err) { - CERROR("cannot get peer for uuid '%s'", uuid); + CERROR("cannot get peer for uuid '%s'\n", uuid); OBD_FREE(service, sizeof(*service)); RETURN(NULL); } -- 1.8.3.1