summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-06-27 17:36:57 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-06-27 17:39:29 +0300
commit38a523a2946d3a0961d141d477a1ee2b1f3bdbb1 (patch)
tree40a2a7ecb942e52c06068d46dbee1c266a3cf1df /include/linux
parent5f8954e099b8ae96e7de1bb95950e00c85bedd40 (diff)
downloadlinux-38a523a2946d3a0961d141d477a1ee2b1f3bdbb1.tar.xz
Revert "devcoredump: remove the useless gfp_t parameter in dev_coredumpv and dev_coredumpm"
This reverts commit 77515ebaf01920e2db49e04672ef669a7c2907f2 as it causes build problems in linux-next. It needs to be reintroduced in a way that can allow the api to evolve and not require a "flag day" to catch all users. Link: https://lore.kernel.org/r/20220623160723.7a44b573@canb.auug.org.au Cc: Duoming Zhou <duoming@zju.edu.cn> Cc: Brian Norris <briannorris@chromium.org> Cc: Johannes Berg <johannes@sipsolutions.net> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/devcoredump.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/include/linux/devcoredump.h b/include/linux/devcoredump.h
index c7d840d824c3..c008169ed2c6 100644
--- a/include/linux/devcoredump.h
+++ b/include/linux/devcoredump.h
@@ -52,26 +52,27 @@ static inline void _devcd_free_sgtable(struct scatterlist *table)
#ifdef CONFIG_DEV_COREDUMP
-void dev_coredumpv(struct device *dev, void *data, size_t datalen);
+void dev_coredumpv(struct device *dev, void *data, size_t datalen,
+ gfp_t gfp);
void dev_coredumpm(struct device *dev, struct module *owner,
- void *data, size_t datalen,
+ void *data, size_t datalen, gfp_t gfp,
ssize_t (*read)(char *buffer, loff_t offset, size_t count,
void *data, size_t datalen),
void (*free)(void *data));
void dev_coredumpsg(struct device *dev, struct scatterlist *table,
- size_t datalen);
+ size_t datalen, gfp_t gfp);
#else
static inline void dev_coredumpv(struct device *dev, void *data,
- size_t datalen)
+ size_t datalen, gfp_t gfp)
{
vfree(data);
}
static inline void
dev_coredumpm(struct device *dev, struct module *owner,
- void *data, size_t datalen,
+ void *data, size_t datalen, gfp_t gfp,
ssize_t (*read)(char *buffer, loff_t offset, size_t count,
void *data, size_t datalen),
void (*free)(void *data))
@@ -80,7 +81,7 @@ dev_coredumpm(struct device *dev, struct module *owner,
}
static inline void dev_coredumpsg(struct device *dev, struct scatterlist *table,
- size_t datalen)
+ size_t datalen, gfp_t gfp)
{
_devcd_free_sgtable(table);
}