LU-4416 tests: small fixes for conf_sanity

[fs/lustre-release.git] / libcfs / libcfs / tracefile.h

diff --git a/libcfs/libcfs/tracefile.h b/libcfs/libcfs/tracefile.h
index d4fe104..ca7f904 100644 (file)
--- a/libcfs/libcfs/tracefile.h
+++ b/libcfs/libcfs/tracefile.h
@@ -40,14 +40,10 @@
 #include <libcfs/libcfs.h>
 
 #ifdef __KERNEL__
-#if defined(__linux__)
-#include "linux/linux-tracefile.h"
-#else
-#error Unsupported operating system.
-#endif
-#else
-#include "posix/posix-tracefile.h"
-#endif
+# include "linux/linux-tracefile.h"
+#else /* __KERNEL__ */
+# include "posix/posix-tracefile.h"
+#endif /* !__KERNEL__ */
 /* trace file lock routines */
 
 #define TRACEFILE_NAME_SIZE 1024
@@ -302,7 +298,7 @@ static inline void cfs_trace_put_tcd(struct cfs_trace_cpu_data *tcd)
        put_cpu();
 }
 
-int cfs_trace_refill_stock(struct cfs_trace_cpu_data *tcd, int gfp,
+int cfs_trace_refill_stock(struct cfs_trace_cpu_data *tcd, gfp_t gfp,
                                struct list_head *stock);