diff options
author | Maxime Ripard <maxime@cerno.tech> | 2021-11-16 10:51:39 +0300 |
---|---|---|
committer | Maxime Ripard <maxime@cerno.tech> | 2021-11-16 10:51:39 +0300 |
commit | 467dd91e2f783d34b2205751bdf88bcdcac55984 (patch) | |
tree | 50712cab9037a8566756ba831a2a60ef5f062d23 /lib/error-inject.c | |
parent | bb162bb2b4394108c8f055d1b115735331205e28 (diff) | |
parent | fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf (diff) | |
download | linux-467dd91e2f783d34b2205751bdf88bcdcac55984.tar.xz |
Merge drm/drm-fixes into drm-misc-fixes
We need -rc1 to address a breakage in drm/scheduler affecting panfrost.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'lib/error-inject.c')
-rw-r--r-- | lib/error-inject.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/error-inject.c b/lib/error-inject.c index c73651b15b76..2ff5ef689d72 100644 --- a/lib/error-inject.c +++ b/lib/error-inject.c @@ -8,6 +8,7 @@ #include <linux/mutex.h> #include <linux/list.h> #include <linux/slab.h> +#include <asm/sections.h> /* Whitelist of symbols that can be overridden for error injection. */ static LIST_HEAD(error_injection_list); @@ -64,7 +65,7 @@ static void populate_error_injection_list(struct error_injection_entry *start, mutex_lock(&ei_mutex); for (iter = start; iter < end; iter++) { - entry = arch_deref_entry_point((void *)iter->addr); + entry = (unsigned long)dereference_symbol_descriptor((void *)iter->addr); if (!kernel_text_address(entry) || !kallsyms_lookup_size_offset(entry, &size, &offset)) { |