diff options
| author |   Michael Ellerman <mpe@ellerman.id.au> | 2019-07-01 14:04:39 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-07-01 14:04:39 +1000 |
| commit | 8b8dc695143642c6a8bee2242f2f7af4232298ab (patch) | |
| tree | c36e89fcf8594e923f14016dc33f12736fd0f5af /arch/powerpc/kernel/prom_init.c | |
| parent | KVM: PPC: Book3S HV: Clear pending decrementer exceptions on nested guest entry (diff) | |
| parent | Merge tag 'powerpc-5.2-6' into fixes (diff) | |
| download | linux-dev-8b8dc695143642c6a8bee2242f2f7af4232298ab.tar.xz linux-dev-8b8dc695143642c6a8bee2242f2f7af4232298ab.zip | |
Merge branch 'fixes' into next
Merge our fixes branch into next, this brings in a number of commits
that fix bugs we don't want to hit in next, in particular the fix for
CVE-2019-12817.
Diffstat (limited to 'arch/powerpc/kernel/prom_init.c')
| -rw-r--r-- | arch/powerpc/kernel/prom_init.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 17f1ae7fae2c..a3fb90bb5a39 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -2349,6 +2349,7 @@ static void __init prom_check_displays(void) prom_printf("W=%d H=%d LB=%d addr=0x%x\n", width, height, pitch, addr); btext_setup_display(width, height, 8, pitch, addr); + btext_prepare_BAT(); } #endif /* CONFIG_PPC_EARLY_DEBUG_BOOTX */ } |