mirror of
https://git.yoctoproject.org/poky
synced 2026-03-09 00:39:39 +01:00
bba60774f7
License-Update: Upstream cleaned stale file paths in License file and updated LICENSES/LGPL-2.1 and LICENSES/GPL-2.0 -> LICENSES/LGPL-2.1-only.txt and LICENSES/GPL-2.0-only.txt causing md5 to change. (ref commit ->b972ef5708and61baff6e8d (diff-c693279643b8cd5d248172d9c22cb7cf4ed163a3c98c8a3f69c2717edd3eacb7)) Note: Upgrade lttng-modules to 2.13.14 to fix fcheck error which occurs with commit 782202de6478f68caaed4567017095ad906c4eef in kernel "file: Rename fcheck lookup_fd_rcu" which does replaces fcheck with lookup_fd_rcu. (From OE-Core rev: 2721f84ba755ceea5780e44feb0713ad8c4d0217) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Siddharth Doshi <sdoshi@mvista.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
80 lines
2.5 KiB
Diff
80 lines
2.5 KiB
Diff
From 82fbf9d383ff9069808fb0f5f75c660098dbae52 Mon Sep 17 00:00:00 2001
|
|
From: Michael Jeanson <mjeanson@efficios.com>
|
|
Date: Tue, 5 Apr 2022 14:57:41 -0400
|
|
Subject: [PATCH 09/10] Rename genhd wrapper to blkdev
|
|
|
|
The genhd.h header was folded into blkdev.h in v5.18, rename our wrapper
|
|
to follow upstream.
|
|
|
|
Upstream-Status: Backport
|
|
|
|
Note: Updated patch to cleanly apply to 2.13.14
|
|
|
|
Change-Id: I4ec94fb94d11712dd20f0680aea1de77fbfa9d17
|
|
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
|
|
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
|
|
Signed-off-by: Siddharth Doshi <sdoshi@mvista.com>
|
|
---
|
|
include/wrapper/{genhd.h => blkdev.h} | 10 +++++-----
|
|
src/lttng-statedump-impl.c | 2 +-
|
|
2 files changed, 6 insertions(+), 6 deletions(-)
|
|
rename include/wrapper/{genhd.h => blkdev.h} (93%)
|
|
|
|
diff --git a/include/wrapper/genhd.h b/include/wrapper/blkdev.h
|
|
similarity index 93%
|
|
rename from include/wrapper/genhd.h
|
|
rename to include/wrapper/blkdev.h
|
|
index e32c7b6..76397f6 100644
|
|
--- a/include/wrapper/genhd.h
|
|
+++ b/include/wrapper/blkdev.h
|
|
@@ -1,6 +1,6 @@
|
|
/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
|
|
*
|
|
- * wrapper/genhd.h
|
|
+ * wrapper/blkdev.h
|
|
*
|
|
* wrapper around block layer functions and data structures. Using
|
|
* KALLSYMS to get its address when available, else we need to have a
|
|
@@ -9,8 +9,8 @@
|
|
* Copyright (C) 2011-2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
|
|
*/
|
|
|
|
-#ifndef _LTTNG_WRAPPER_GENHD_H
|
|
-#define _LTTNG_WRAPPER_GENHD_H
|
|
+#ifndef _LTTNG_WRAPPER_BLKDEV_H
|
|
+#define _LTTNG_WRAPPER_BLKDEV_H
|
|
|
|
#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0) \
|
|
|| LTTNG_RHEL_KERNEL_RANGE(5,14,0,162,0,0, 5,15,0,0,0,0))
|
|
@@ -47,7 +47,7 @@ struct class *wrapper_get_block_class(void)
|
|
/*
|
|
* Canary function to check for 'block_class' at compile time.
|
|
*
|
|
- * From 'include/linux/genhd.h':
|
|
+ * From 'include/linux/blkdev.h':
|
|
*
|
|
* extern struct class block_class;
|
|
*/
|
|
@@ -106,4 +106,4 @@ struct device_type *wrapper_get_disk_type(void)
|
|
|
|
#endif
|
|
|
|
-#endif /* _LTTNG_WRAPPER_GENHD_H */
|
|
+#endif /* _LTTNG_WRAPPER_BLKDEV_H */
|
|
diff --git a/src/lttng-statedump-impl.c b/src/lttng-statedump-impl.c
|
|
index 9d197ce..229517e 100644
|
|
--- a/src/lttng-statedump-impl.c
|
|
+++ b/src/lttng-statedump-impl.c
|
|
@@ -42,7 +42,7 @@
|
|
#include <wrapper/namespace.h>
|
|
#include <wrapper/irq.h>
|
|
#include <wrapper/tracepoint.h>
|
|
-#include <wrapper/genhd.h>
|
|
+#include <wrapper/blkdev.h>
|
|
#include <wrapper/file.h>
|
|
#include <wrapper/fdtable.h>
|
|
#include <wrapper/sched.h>
|
|
--
|
|
2.35.7
|
|
|