diff options
| author | Mark Brown <broonie@kernel.org> | 2021-10-18 14:50:42 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-10-18 14:50:42 +0200 |
| commit | b8f3b564937c1f3529bc4897cc41c5d95d2cdbe9 (patch) | |
| tree | b71ed4906bbe2ca96d68dbf1d6d6f0fe2676f1de /kernel/printk/printk.c | |
| parent | ASoC: dt-bindings: rockchip: i2s-tdm: Drop rockchip,cru property (diff) | |
| parent | Linux 5.15-rc6 (diff) | |
| download | linux-b8f3b564937c1f3529bc4897cc41c5d95d2cdbe9.tar.xz linux-b8f3b564937c1f3529bc4897cc41c5d95d2cdbe9.zip | |
Merge tag 'v5.15-rc6' into asoc-5.16
Linux 5.15-rc6
Diffstat (limited to 'kernel/printk/printk.c')
| -rw-r--r-- | kernel/printk/printk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 825277e1e742..a8d0a58deebc 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -1166,9 +1166,9 @@ void __init setup_log_buf(int early) return; err_free_descs: - memblock_free(__pa(new_descs), new_descs_size); + memblock_free_ptr(new_descs, new_descs_size); err_free_log_buf: - memblock_free(__pa(new_log_buf), new_log_buf_len); + memblock_free_ptr(new_log_buf, new_log_buf_len); } static bool __read_mostly ignore_loglevel; |