Merge tag 'driver-core-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core updates from Greg KH: "Here is a small number of driver core patches for 4.20-rc1. Not much happened here this merge window, only a very tiny number of patches that do: - add BUS_ATTR_WO() for use by drivers - component error path fixes - kernfs range check fix - other tiny error path fixes and const changes All of these have been in linux-next with no reported issues for a while" * tag 'driver-core-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: devres: provide devm_kstrdup_const() mm: move is_kernel_rodata() to asm-generic/sections.h devres: constify p in devm_kfree() driver core: add BUS_ATTR_WO() macro kernfs: Fix range checks in kernfs_get_target_path component: fix loop condition to call unbind() if bind() fails drivers/base/devtmpfs.c: don't pretend path is const in delete_path kernfs: update comment about kernfs_path() return value
This commit is contained in:
@@ -141,4 +141,18 @@ static inline bool init_section_intersects(void *virt, size_t size)
|
||||
return memory_intersects(__init_begin, __init_end, virt, size);
|
||||
}
|
||||
|
||||
/**
|
||||
* is_kernel_rodata - checks if the pointer address is located in the
|
||||
* .rodata section
|
||||
*
|
||||
* @addr: address to check
|
||||
*
|
||||
* Returns: true if the address is located in .rodata, false otherwise.
|
||||
*/
|
||||
static inline bool is_kernel_rodata(unsigned long addr)
|
||||
{
|
||||
return addr >= (unsigned long)__start_rodata &&
|
||||
addr < (unsigned long)__end_rodata;
|
||||
}
|
||||
|
||||
#endif /* _ASM_GENERIC_SECTIONS_H_ */
|
||||
|
@@ -55,6 +55,8 @@ struct bus_attribute {
|
||||
struct bus_attribute bus_attr_##_name = __ATTR_RW(_name)
|
||||
#define BUS_ATTR_RO(_name) \
|
||||
struct bus_attribute bus_attr_##_name = __ATTR_RO(_name)
|
||||
#define BUS_ATTR_WO(_name) \
|
||||
struct bus_attribute bus_attr_##_name = __ATTR_WO(_name)
|
||||
|
||||
extern int __must_check bus_create_file(struct bus_type *,
|
||||
struct bus_attribute *);
|
||||
@@ -692,8 +694,10 @@ static inline void *devm_kcalloc(struct device *dev,
|
||||
{
|
||||
return devm_kmalloc_array(dev, n, size, flags | __GFP_ZERO);
|
||||
}
|
||||
extern void devm_kfree(struct device *dev, void *p);
|
||||
extern void devm_kfree(struct device *dev, const void *p);
|
||||
extern char *devm_kstrdup(struct device *dev, const char *s, gfp_t gfp) __malloc;
|
||||
extern const char *devm_kstrdup_const(struct device *dev,
|
||||
const char *s, gfp_t gfp);
|
||||
extern void *devm_kmemdup(struct device *dev, const void *src, size_t len,
|
||||
gfp_t gfp);
|
||||
|
||||
|
@@ -477,10 +477,11 @@ static inline void kernfs_init(void) { }
|
||||
* @buf: buffer to copy @kn's name into
|
||||
* @buflen: size of @buf
|
||||
*
|
||||
* Builds and returns the full path of @kn in @buf of @buflen bytes. The
|
||||
* path is built from the end of @buf so the returned pointer usually
|
||||
* doesn't match @buf. If @buf isn't long enough, @buf is nul terminated
|
||||
* and %NULL is returned.
|
||||
* If @kn is NULL result will be "(null)".
|
||||
*
|
||||
* Returns the length of the full path. If the full length is equal to or
|
||||
* greater than @buflen, @buf contains the truncated path with the trailing
|
||||
* '\0'. On error, -errno is returned.
|
||||
*/
|
||||
static inline int kernfs_path(struct kernfs_node *kn, char *buf, size_t buflen)
|
||||
{
|
||||
|
Fai riferimento in un nuovo problema
Block a user