diff options
| author | Jiri Kosina <jkosina@suse.com> | 2026-02-09 17:33:26 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.com> | 2026-02-09 17:33:26 +0100 |
| commit | ec496f77b4c11036cc835d6f045fb5e5ef1e6530 (patch) | |
| tree | e0f5a8f9ffec9de060b7b617514daecc8bdaca6d /kernel/trace/trace_events_user.c | |
| parent | 984d6f361d19486fcd8fc13d29112fe73123f482 (diff) | |
| parent | ae40ace015be442837934c5028a8eba7fe3cd98f (diff) | |
| download | linux-next-ec496f77b4c11036cc835d6f045fb5e5ef1e6530.tar.gz linux-next-ec496f77b4c11036cc835d6f045fb5e5ef1e6530.zip | |
Merge branch 'for-6.20/sony' into for-linus
- Support for Rock band 4 PS4 and PS5 guitars (Rosalie Wanders)
Diffstat (limited to 'kernel/trace/trace_events_user.c')
| -rw-r--r-- | kernel/trace/trace_events_user.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c index b15854c75d4f..dca6e50b3b21 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -1041,7 +1041,7 @@ static int user_field_array_size(const char *type) static int user_field_size(const char *type) { - /* long is not allowed from a user, since it's ambigious in size */ + /* long is not allowed from a user, since it's ambiguous in size */ if (strcmp(type, "s64") == 0) return sizeof(s64); if (strcmp(type, "u64") == 0) @@ -1079,7 +1079,7 @@ static int user_field_size(const char *type) if (str_has_prefix(type, "__rel_loc ")) return sizeof(u32); - /* Uknown basic type, error */ + /* Unknown basic type, error */ return -EINVAL; } @@ -2465,7 +2465,7 @@ static long user_events_ioctl_reg(struct user_event_file_info *info, /* * Prevent users from using the same address and bit multiple times * within the same mm address space. This can cause unexpected behavior - * for user processes that is far easier to debug if this is explictly + * for user processes that is far easier to debug if this is explicitly * an error upon registering. */ if (current_user_event_enabler_exists((unsigned long)reg.enable_addr, |