diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-22 15:48:32 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-22 15:48:32 +0100 |
| commit | 3f68a0594a60d2cea0fd248a4f8f1b3bf8313f96 (patch) | |
| tree | a2e379113501cd3648824218034719bbc9b81612 /include | |
| parent | b3bc2cdb1424a78387dde319f1de3622e13d60df (diff) | |
| parent | 9b91d36ba301db86bbf9e783169f7f6abf2585d8 (diff) | |
Merge tag 'v5.15.141' into fslc-5.15-2.2.x-imx
This is the 5.15.141 stable release
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hid.h | 5 | ||||
| -rw-r--r-- | include/linux/sysctl.h | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index c3478e396829..ad97435d8e01 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -630,8 +630,13 @@ struct hid_device { /* device report descriptor */ struct list_head debug_list; spinlock_t debug_list_lock; wait_queue_head_t debug_wait; + struct kref ref; + + unsigned int id; /* system unique id */ }; +void hiddev_free(struct kref *ref); + #define to_hid_device(pdev) \ container_of(pdev, struct hid_device, dev) diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 47cf70c8eb93..32d79ef906e5 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -210,6 +210,7 @@ extern void __register_sysctl_init(const char *path, struct ctl_table *table, const char *table_name); #define register_sysctl_init(path, table) __register_sysctl_init(path, table, #table) void do_sysctl_args(void); +bool sysctl_is_alias(char *param); extern int pwrsw_enabled; extern int unaligned_enabled; @@ -251,6 +252,11 @@ static inline void setup_sysctl_set(struct ctl_table_set *p, static inline void do_sysctl_args(void) { } + +static inline bool sysctl_is_alias(char *param) +{ + return false; +} #endif /* CONFIG_SYSCTL */ int sysctl_max_threads(struct ctl_table *table, int write, void *buffer, |