diff options
| author | Ingo Molnar <[email protected]> | 2021-10-16 15:17:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2021-10-16 15:17:46 +0200 |
| commit | 082f20b21de20285da2cbfc1be29656f0714c1b8 (patch) | |
| tree | 6170af99f1491fe256351b9cf92725dbda79c153 /tools/perf/tests/code-reading.c | |
| parent | 724fc0248d450224b19ef5b5ee41e392348f6704 (diff) | |
| parent | b2381acd3fd9bacd2c63f53b2c610c89959b31cc (diff) | |
Merge branch 'x86/urgent' into x86/fpu, to resolve a conflict
Resolve the conflict between these commits:
x86/fpu: 1193f408cd51 ("x86/fpu/signal: Change return type of __fpu_restore_sig() to boolean")
x86/urgent: d298b03506d3 ("x86/fpu: Restore the masking out of reserved MXCSR bits")
b2381acd3fd9 ("x86/fpu: Mask out the invalid MXCSR bits properly")
Conflicts:
arch/x86/kernel/fpu/signal.c
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'tools/perf/tests/code-reading.c')
| -rw-r--r-- | tools/perf/tests/code-reading.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c index 9866cddebf23..9b4a765e4b73 100644 --- a/tools/perf/tests/code-reading.c +++ b/tools/perf/tests/code-reading.c @@ -229,8 +229,8 @@ static int read_object_code(u64 addr, size_t len, u8 cpumode, struct thread *thread, struct state *state) { struct addr_location al; - unsigned char buf1[BUFSZ]; - unsigned char buf2[BUFSZ]; + unsigned char buf1[BUFSZ] = {0}; + unsigned char buf2[BUFSZ] = {0}; size_t ret_len; u64 objdump_addr; const char *objdump_name; |