diff options
| author | Tom Rini <[email protected]> | 2022-09-19 13:19:39 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-09-19 16:07:12 -0400 |
| commit | e9a1ff9724348408144c7f1c5b5cc26130ba46e5 (patch) | |
| tree | 68b56f117206d121b4a7e567b0209c02283c98e6 /include/asm-generic | |
| parent | b6c50e5831f6ce3800d4b3cf3c7aa35dde8c48d9 (diff) | |
| parent | f76f3e3b44328fe6229650540109af93750fd5f0 (diff) | |
Merge branch 'master' into next
Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/global_data.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 9006c769279..4aeb61f08c4 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -116,10 +116,14 @@ struct global_data { /** * @precon_buf_idx: pre-console buffer index * - * @precon_buf_idx indicates the current position of the buffer used to - * collect output before the console becomes available + * @precon_buf_idx indicates the current position of the + * buffer used to collect output before the console becomes + * available. When negative, the pre-console buffer is + * temporarily disabled (used when the pre-console buffer is + * being written out, to prevent adding its contents to + * itself). */ - unsigned long precon_buf_idx; + long precon_buf_idx; #endif /** * @env_addr: address of environment structure |