Merge tag 'v5.14-rc1' into android-mainline
Linux 5.14-rc1 Change-Id: I9765cd4581f6683a6fca3580667017fff9cbaa2b Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
@@ -11,6 +11,7 @@
|
||||
|
||||
#include <linux/list.h>
|
||||
#include <linux/stat.h>
|
||||
#include <linux/buildid.h>
|
||||
#include <linux/compiler.h>
|
||||
#include <linux/cache.h>
|
||||
#include <linux/kmod.h>
|
||||
@@ -369,6 +370,11 @@ struct module {
|
||||
/* Unique handle for this module */
|
||||
char name[MODULE_NAME_LEN];
|
||||
|
||||
#ifdef CONFIG_STACKTRACE_BUILD_ID
|
||||
/* Module build ID */
|
||||
unsigned char build_id[BUILD_ID_SIZE_MAX];
|
||||
#endif
|
||||
|
||||
/* Sysfs stuff. */
|
||||
struct module_kobject mkobj;
|
||||
struct module_attribute *modinfo_attrs;
|
||||
@@ -639,7 +645,7 @@ void *dereference_module_function_descriptor(struct module *mod, void *ptr);
|
||||
const char *module_address_lookup(unsigned long addr,
|
||||
unsigned long *symbolsize,
|
||||
unsigned long *offset,
|
||||
char **modname,
|
||||
char **modname, const unsigned char **modbuildid,
|
||||
char *namebuf);
|
||||
int lookup_module_symbol_name(unsigned long addr, char *symname);
|
||||
int lookup_module_symbol_attrs(unsigned long addr, unsigned long *size, unsigned long *offset, char *modname, char *name);
|
||||
@@ -743,6 +749,7 @@ static inline const char *module_address_lookup(unsigned long addr,
|
||||
unsigned long *symbolsize,
|
||||
unsigned long *offset,
|
||||
char **modname,
|
||||
const unsigned char **modbuildid,
|
||||
char *namebuf)
|
||||
{
|
||||
return NULL;
|
||||
|
||||
Reference in New Issue
Block a user