Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions drivers/watchdog/diag288_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
* to CP.
*
* The command can be altered using the module parameter "cmd". This is
* not recommended because it's only supported on z/VM but not whith LPAR.
* not recommended because it's only supported on z/VM but not with LPAR.
*
* On LPAR, the watchdog will always trigger a system restart. the module
* paramter cmd is meaningless here.
* On LPAR, the watchdog will always trigger a system restart. The module
* parameter cmd is meaningless here.
*
*
* Copyright IBM Corp. 2004, 2013
Expand Down
2 changes: 1 addition & 1 deletion include/drm/drm_plane.h
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ struct drm_plane_funcs {
*
* This is the legacy entry point to enable and configure the plane for
* the given CRTC and framebuffer. It is never called to disable the
* plane, i.e. the passed-in crtc and fb paramters are never NULL.
* plane, i.e. the passed-in crtc and fb parameters are never NULL.
*
* The source rectangle in frame buffer memory coordinates is given by
* the src_x, src_y, src_w and src_h parameters (as 16.16 fixed point
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/Documentation/perf-script.txt
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ OPTIONS
is printed. This is the full execution path leading to the sample. This is only supported when the
sample was recorded with perf record -b or -j any.

Use brstackinsnlen to print the brstackinsn lenght. For example, you
Use brstackinsnlen to print the brstackinsn length. For example, you
can’t know the next sequential instruction after an unconditional branch unless
you calculate that based on its length.

Expand Down
7 changes: 5 additions & 2 deletions tools/perf/builtin-trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -4291,7 +4291,10 @@ static int trace__expand_filter(struct trace *trace, struct evsel *evsel)

if (fmt->strtoul(right, right_size, &syscall_arg, &val)) {
char *n, expansion[19];
int expansion_lenght = scnprintf(expansion, sizeof(expansion), "%#" PRIx64, val);
int expansion_length;

expansion_length = scnprintf(expansion, sizeof(expansion),
"%#" PRIx64, val);
int expansion_offset = right - new_filter;

pr_debug("%s", expansion);
Expand All @@ -4303,7 +4306,7 @@ static int trace__expand_filter(struct trace *trace, struct evsel *evsel)
}
if (new_filter != evsel->filter)
free(new_filter);
left = n + expansion_offset + expansion_lenght;
left = n + expansion_offset + expansion_length;
new_filter = n;
} else {
pr_err("\"%.*s\" not found for \"%s\" in \"%s\", can't set filter \"%s\"\n",
Expand Down