Fix: update kmem instrumentation for kernel 4.15

[lttng-modules.git] / lib / align.h

diff --git a/lib/align.h b/lib/align.h
index 0b861000300c726ec2e0f242b1d31ca8d020ccde..5b91ae87410bdff7c031dbae5b8feb6a52b0c7ec 100644 (file)
--- a/lib/align.h
+++ b/lib/align.h
@@ -4,15 +4,27 @@
 /*
  * lib/align.h
  *
- * (C) Copyright 2010-2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; only
+ * version 2.1 of the License.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifdef __KERNEL__
 
 #include <linux/types.h>
-#include "bug.h"
+#include <lib/bug.h>
 
 #define ALIGN_FLOOR(x, a)      __ALIGN_FLOOR_MASK(x, (typeof(x)) (a) - 1)
 #define __ALIGN_FLOOR_MASK(x, mask)    ((x) & ~(mask))
@@ -53,7 +65,7 @@
        ({                                                                     \
                BUILD_RUNTIME_BUG_ON((alignment) == 0                          \
                                   || ((alignment) & ((alignment) - 1)));      \
-               (((align_drift) - (alignment)) & ((alignment) - 1);            \
+               (((align_drift) - (alignment)) & ((alignment) - 1));           \
        })
 
 #endif /* __KERNEL__ */