From f85def84248f35d3cad434d7474e93a5ba7c26c0 Mon Sep 17 00:00:00 2001 From: "robert.read" Date: Wed, 13 Aug 2008 19:21:26 +0000 Subject: [PATCH] Branch HEAD b=16639 i=umka i=nathan Fix user space build when older kernel is installed, and remove old and redundant code.. (Remaining part of patch - remove the deleted includes.) --- libcfs/include/libcfs/darwin/portals_utils.h | 54 ----------------- libcfs/include/libcfs/linux/portals_utils.h | 87 ---------------------------- libcfs/include/libcfs/portals_utils.h | 54 ----------------- 3 files changed, 195 deletions(-) delete mode 100644 libcfs/include/libcfs/darwin/portals_utils.h delete mode 100644 libcfs/include/libcfs/linux/portals_utils.h delete mode 100644 libcfs/include/libcfs/portals_utils.h diff --git a/libcfs/include/libcfs/darwin/portals_utils.h b/libcfs/include/libcfs/darwin/portals_utils.h deleted file mode 100644 index 4dcb6b7..0000000 --- a/libcfs/include/libcfs/darwin/portals_utils.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * - * GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * GPL HEADER END - */ -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved - * Use is subject to license terms. - */ -/* - * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. - */ - -#ifndef __LIBCFS_DARWIN_PORTALS_UTILS_H__ -#define __LIBCFS_DARWIN_PORTALS_UTILS_H__ - -#ifndef __LIBCFS_PORTALS_UTILS_H__ -#error Do not #include this file directly. #include instead -#endif - -#include -#ifdef __KERNEL__ -#include -#include -#else /* !__KERNEL__ */ -#include -#include -#include -#endif /* !__KERNEL__ */ - -#endif diff --git a/libcfs/include/libcfs/linux/portals_utils.h b/libcfs/include/libcfs/linux/portals_utils.h deleted file mode 100644 index 7d5788b..0000000 --- a/libcfs/include/libcfs/linux/portals_utils.h +++ /dev/null @@ -1,87 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * - * GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * GPL HEADER END - */ -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved - * Use is subject to license terms. - */ -/* - * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. - */ - -#ifndef __LIBCFS_LINUX_PORTALS_UTILS_H__ -#define __LIBCFS_LINUX_PORTALS_UTILS_H__ - -#ifndef __LIBCFS_PORTALS_UTILS_H__ -#error Do not #include this file directly. #include instead -#endif - -#ifdef __KERNEL__ -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) -# include -#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) */ -# include -#endif -#include -#include -#else /* !__KERNEL__ */ - -#include -#include - -#ifdef HAVE_LINUX_VERSION_H -# include - -# if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) -# define BUG() /* workaround for module.h includes */ -# include -# endif -#endif /* !HAVE_LINUX_VERSION_H */ - -#ifndef __CYGWIN__ -# include -#else /* __CYGWIN__ */ -# include -# include -# include -#endif /* __CYGWIN__ */ - -#endif /* !__KERNEL__ */ -#endif diff --git a/libcfs/include/libcfs/portals_utils.h b/libcfs/include/libcfs/portals_utils.h deleted file mode 100644 index 7d36ec6..0000000 --- a/libcfs/include/libcfs/portals_utils.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * - * GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * GPL HEADER END - */ -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved - * Use is subject to license terms. - */ -/* - * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. - */ - -#ifndef __LIBCFS_PORTALS_UTILS_H__ -#define __LIBCFS_PORTALS_UTILS_H__ - -/* - * portals_utils.h - * - */ -#if defined(__linux__) -#include -#elif defined(__APPLE__) -#include -#elif defined(__WINNT__) -#include -#else -#error Unsupported Operating System -#endif - -#endif -- 1.8.3.1