liblockdep: Move dummy definition of prandom_u32() to fix missing declaration
This commit is contained in:
parent
68902cad17
commit
47ba702e2c
|
@ -44,6 +44,8 @@ linux (4.7.2-1) UNRELEASED; urgency=medium
|
|||
- Enable EFI_SECURE_BOOT_SECURELEVEL
|
||||
* tcp: fix use after free in tcp_xmit_retransmit_queue() (CVE-2016-6828)
|
||||
* aacraid: Check size values after double-fetch from user (CVE-2016-6480)
|
||||
* liblockdep: Move dummy definition of prandom_u32() to fix missing
|
||||
declaration
|
||||
|
||||
[ Martin Michlmayr ]
|
||||
* [armhf] Enable MMC_SDHCI_IPROC and HW_RANDOM_BCM2835 for BCM2835.
|
||||
|
|
|
@ -16,13 +16,11 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|||
tools/lib/lockdep/uinclude/linux/lockdep.h | 10 ----------
|
||||
2 files changed, 10 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/tools/lib/lockdep/lockdep.c b/tools/lib/lockdep/lockdep.c
|
||||
index a0a2e3a266af..513140ea8a58 100644
|
||||
--- a/tools/lib/lockdep/lockdep.c
|
||||
+++ b/tools/lib/lockdep/lockdep.c
|
||||
@@ -5,4 +5,14 @@
|
||||
#define hlist_add_head_rcu hlist_add_head
|
||||
#define hlist_del_rcu hlist_del
|
||||
@@ -12,4 +12,14 @@ u32 prandom_u32(void)
|
||||
abort();
|
||||
}
|
||||
|
||||
+static struct new_utsname *init_utsname(void)
|
||||
+{
|
||||
|
@ -35,8 +33,6 @@ index a0a2e3a266af..513140ea8a58 100644
|
|||
+}
|
||||
+
|
||||
#include "../../../kernel/locking/lockdep.c"
|
||||
diff --git a/tools/lib/lockdep/uinclude/linux/lockdep.h b/tools/lib/lockdep/uinclude/linux/lockdep.h
|
||||
index d1079034a14d..c157242e0417 100644
|
||||
--- a/tools/lib/lockdep/uinclude/linux/lockdep.h
|
||||
+++ b/tools/lib/lockdep/uinclude/linux/lockdep.h
|
||||
@@ -44,16 +44,6 @@ static inline int debug_locks_off(void)
|
||||
|
|
|
@ -14,26 +14,21 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|||
tools/lib/lockdep/common.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/tools/lib/lockdep/common.c b/tools/lib/lockdep/common.c
|
||||
index d1c89cc06f5f..405c17667c4d 100644
|
||||
--- a/tools/lib/lockdep/common.c
|
||||
+++ b/tools/lib/lockdep/common.c
|
||||
@@ -1,5 +1,6 @@
|
||||
#include <stddef.h>
|
||||
#include <stdbool.h>
|
||||
+#include <stdlib.h>
|
||||
#include <linux/compiler.h>
|
||||
--- a/tools/lib/lockdep/lockdep.c
|
||||
+++ b/tools/lib/lockdep/lockdep.c
|
||||
@@ -1,8 +1,15 @@
|
||||
#include <linux/lockdep.h>
|
||||
#include <unistd.h>
|
||||
@@ -10,6 +11,11 @@ static __thread struct task_struct current_obj;
|
||||
/* lockdep wants these */
|
||||
bool debug_locks = true;
|
||||
bool debug_locks_silent;
|
||||
+#include <stdlib.h>
|
||||
|
||||
/* Trivial API wrappers, we don't (yet) have RCU in user-space: */
|
||||
#define hlist_for_each_entry_rcu hlist_for_each_entry
|
||||
#define hlist_add_head_rcu hlist_add_head
|
||||
#define hlist_del_rcu hlist_del
|
||||
|
||||
+u32 prandom_u32(void)
|
||||
+{
|
||||
+ /* Used only by lock_pin_lock() which is dead code */
|
||||
+ abort();
|
||||
+}
|
||||
|
||||
__attribute__((destructor)) static void liblockdep_exit(void)
|
||||
{
|
||||
+
|
||||
#include "../../../kernel/locking/lockdep.c"
|
||||
|
|
Loading…
Reference in New Issue