Fix: SCSI instrumentation for SLES12 SP2

[lttng-modules.git] / lib / prio_heap / lttng_prio_heap.c

diff --git a/lib/prio_heap/lttng_prio_heap.c b/lib/prio_heap/lttng_prio_heap.c
index 5bbd0793b8a6d5ca2a7a57772a88de9bc5eac934..6db7f524008c332dfa426f5dbf7c8a5d4b9361b7 100644 (file)
--- a/lib/prio_heap/lttng_prio_heap.c
+++ b/lib/prio_heap/lttng_prio_heap.c
@@ -14,10 +14,18 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <linux/slab.h>
-#include "lttng_prio_heap.h"
+#include <lib/prio_heap/lttng_prio_heap.h>
 
 #ifdef DEBUG_HEAP
 void lttng_check_heap(const struct lttng_ptr_heap *heap)
@@ -91,6 +99,7 @@ int lttng_heap_init(struct lttng_ptr_heap *heap, size_t alloc_len,
        heap->len = 0;
        heap->alloc_len = 0;
        heap->gt = gt;
+       heap->gfpmask = gfpmask;
        /*
         * Minimum size allocated is 1 entry to ensure memory allocation
         * never fails within heap_replace_max.