Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-1346 libcfs: tcpip/time/type related cleanup
[fs/lustre-release.git]
/
libcfs
/
include
/
libcfs
/
darwin
/
libcfs.h
diff --git
a/libcfs/include/libcfs/darwin/libcfs.h
b/libcfs/include/libcfs/darwin/libcfs.h
index
e672a70
..
8f05975
100644
(file)
--- a/
libcfs/include/libcfs/darwin/libcfs.h
+++ b/
libcfs/include/libcfs/darwin/libcfs.h
@@
-1,6
+1,4
@@
-/* -*- 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.
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@
-28,6
+26,8
@@
/*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
/*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-95,7
+95,6
@@
typedef unsigned long long cycles_t;
#else
# define THREAD_SIZE 8192
#endif
#else
# define THREAD_SIZE 8192
#endif
-#define LUSTRE_TRACE_SIZE (THREAD_SIZE >> 5)
#define CHECK_STACK(msgdata, mask, cdls) do {} while(0)
#define CDEBUG_STACK() (0L)
#define CHECK_STACK(msgdata, mask, cdls) do {} while(0)
#define CDEBUG_STACK() (0L)
@@
-190,7
+189,7
@@
__entry_nesting(&__cdd);
/*
* XNU has no capabilities
*/
/*
* XNU has no capabilities
*/
-typedef __u32
cfs_
kernel_cap_t;
+typedef __u32 kernel_cap_t;
#ifdef __KERNEL__
enum {
#ifdef __KERNEL__
enum {