Merge branch 'i2c/for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[deliverable/linux.git] / drivers / staging / lustre / lustre / include / obd_support.h

diff --git a/drivers/staging/lustre/lustre/include/obd_support.h b/drivers/staging/lustre/lustre/include/obd_support.h
index cc5af509b2616fa988e6cacdfab53151794cab80..92c89925ff67c202ab949d5a988603245e1d479b 100644 (file)
--- a/drivers/staging/lustre/lustre/include/obd_support.h
+++ b/drivers/staging/lustre/lustre/include/obd_support.h
@@ -37,11 +37,10 @@
 #ifndef _OBD_SUPPORT
 #define _OBD_SUPPORT
 
-#include <linux/libcfs/libcfs.h>
-#include <lvfs.h>
-#include <lprocfs_status.h>
-
-#include <linux/obd_support.h>
+#include "../../include/linux/libcfs/libcfs.h"
+#include "lvfs.h"
+#include "lprocfs_status.h"
+#include "linux/obd_support.h"
 
 /* global variables */
 extern struct lprocfs_stats *obd_memory;
@@ -509,7 +508,7 @@ extern atomic_t libcfs_kmemory;
 
 extern void obd_update_maxusage(void);
 
-#ifdef LPROCFS
+#if defined (CONFIG_PROC_FS)
 #define obd_memory_add(size)                                             \
        lprocfs_counter_add(obd_memory, OBD_MEMORY_STAT, (long)(size))
 #define obd_memory_sub(size)                                             \
@@ -663,7 +662,7 @@ do {                                                                              \
        if (unlikely((ptr) == NULL)) {                                  \
                CERROR("vmalloc of '" #ptr "' (%d bytes) failed\n",        \
                       (int)(size));                                      \
-               CERROR(LPU64" total bytes allocated by Lustre, %d by LNET\n", \
+               CERROR("%llu total bytes allocated by Lustre, %d by LNET\n", \
                       obd_memory_sum(), atomic_read(&libcfs_kmemory));   \
        } else {                                                              \
                OBD_ALLOC_POST(ptr, size, "vmalloced");                \
@@ -823,11 +822,11 @@ do {                                                                            \
                alloc_page(gfp_mask) :                                \
                alloc_pages_node(cfs_cpt_spread_node(cptab, cpt), gfp_mask, 0);\
        if (unlikely((ptr) == NULL)) {                                  \
-               CERROR("alloc_pages of '" #ptr "' %d page(s) / "LPU64" bytes "\
+               CERROR("alloc_pages of '" #ptr "' %d page(s) / %llu bytes "\
                       "failed\n", (int)1,                                  \
                       (__u64)(1 << PAGE_CACHE_SHIFT));                  \
-               CERROR(LPU64" total bytes and "LPU64" total pages "        \
-                      "("LPU64" bytes) allocated by Lustre, "          \
+               CERROR("%llu total bytes and %llu total pages "    \
+                      "(%llu bytes) allocated by Lustre, "             \
                       "%d total bytes by LNET\n",                          \
                       obd_memory_sum(),                                      \
                       obd_pages_sum() << PAGE_CACHE_SHIFT,                  \
@@ -836,7 +835,7 @@ do {                                                                              \
        } else {                                                              \
                obd_pages_add(0);                                            \
                CDEBUG(D_MALLOC, "alloc_pages '" #ptr "': %d page(s) / "      \
-                      LPU64" bytes at %p.\n",                          \
+                      "%llu bytes at %p.\n",                           \
                       (int)1,                                          \
                       (__u64)(1 << PAGE_CACHE_SHIFT), ptr);                \
        }                                                                    \
@@ -851,7 +850,7 @@ do {                                                                              \
 do {                                                                     \
        LASSERT(ptr);                                                    \
        obd_pages_sub(0);                                                    \
-       CDEBUG(D_MALLOC, "free_pages '" #ptr "': %d page(s) / "LPU64" bytes " \
+       CDEBUG(D_MALLOC, "free_pages '" #ptr "': %d page(s) / %llu bytes " \
               "at %p.\n",                                                  \
               (int)1, (__u64)(1 << PAGE_CACHE_SHIFT),                    \
               ptr);                                                      \