LU-812 kernel: AUTOCONF_INCLUDED removed

[fs/lustre-release.git] / lustre / include / linux / obd_support.h

diff --git a/lustre/include/linux/obd_support.h b/lustre/include/linux/obd_support.h
index 0d51925..4fdb4e5 100644 (file)
--- a/lustre/include/linux/obd_support.h
+++ b/lustre/include/linux/obd_support.h
@@ -1,42 +1,70 @@
-#ifndef _OBD_SUPPORT
-#define _OBD_SUPPORT
 /*
- * Copyright (C) 2001  Cluster File Systems, Inc.
+ * 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 (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
  *
- * This code is issued under the GNU General Public License.
- * See the file COPYING in this distribution
+ * Copyright (c) 2011, Whamcloud, Inc.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
-#include <linux/autoconf.h>
-#include <linux/slab.h>
-#include <linux/kp30.h>
+#ifndef _LINUX_OBD_SUPPORT
+#define _LINUX_OBD_SUPPORT
+
+#ifndef _OBD_SUPPORT
+#error Do not #include this file directly. #include <obd_support.h> instead
+#endif
 
-/* global variables */
-extern int obd_debug_level;
-extern unsigned long obd_memory;
+#ifdef __KERNEL__
+#include <asm/cpufeature.h>
+#include <asm/processor.h>
+#include <linux/seq_file.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/highmem.h>
+#include <linux/swap.h>
+#endif
+#include <libcfs/libcfs.h>
+#include <linux/lustre_compat25.h>
+#include <lustre/lustre_idl.h>
 
-#define OBD_ALLOC(ptr, size)                                    \
-do {                                                            \
-        long s = (size);                                        \
-        (ptr) = kmalloc(s, GFP_KERNEL);                         \
-        if ((ptr) == NULL) {                                    \
-                CERROR("kernel malloc of %ld bytes failed at "  \
-                       "%s:%d\n", s, __FILE__, __LINE__);       \
-        } else {                                                \
-                memset((ptr), 0, s);                            \
-                obd_memory += s;                                \
-        }                                                       \
-        CDEBUG(D_MALLOC, "kmalloced: %ld at %x (tot %ld).\n",   \
-               s, (int)(ptr), obd_memory);                      \
-} while (0)
 
-#define OBD_FREE(ptr, size)                                     \
-do {                                                            \
-        int s = (size);                                         \
-        kfree((ptr));                                           \
-        CDEBUG(D_MALLOC, "kfreed: %d at %x (tot %ld).\n",       \
-               s, (int)(ptr), obd_memory);                      \
-        obd_memory -= s;                                        \
-} while (0)
+#ifdef __KERNEL__
+# include <linux/types.h>
+# include <linux/blkdev.h>
+# include <lvfs.h>
+#else /* !__KERNEL__ */
+# define LTIME_S(time) (time)
+/* for obd_class.h */
+# ifndef ERR_PTR
+#  define ERR_PTR(a) ((void *)(a))
+# endif
+#endif  /* __KERNEL__ */
 
 #endif