diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2019-11-26 11:56:59 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-11-27 14:39:33 +0100 |
| commit | bafb8da8e48716810331ecbd78dee7e2912d1c3e (patch) | |
| tree | 9622ebfe081083c2ef0bb17a2f29d551ca44a524 /MAKEALL | |
| parent | c7ec778bbe2527254c2a05f990bb632c72d94563 (diff) | |
| download | barebox-bafb8da8e48716810331ecbd78dee7e2912d1c3e.tar.gz barebox-bafb8da8e48716810331ecbd78dee7e2912d1c3e.tar.xz | |
pstore: fix build by re-resolving botched merge conflict
297ac7288 ("pstore: Only capture log messages") removed the pstore console.
v3 of the eventually merged 75a74b5c ("console: fix out-of-bounds read
in dputc(/dev/*, ...)") reinstated part of this code, which broke the
pstore build because the now removed bufsize member had a user
reintroduced in the patch.
Fix this by reverting the offending patch's changes to the pstore code.
It wasn't applicable to begin with.
Fixes: 75a74b5c ("console: fix out-of-bounds read in dputc(/dev/*, ...)")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'MAKEALL')
0 files changed, 0 insertions, 0 deletions