Merge b1a384d2 ("ARM: fix build warning in proc-v7-bugs.c") into android-mainline

Steps on the way to 5.17-rc8

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6c7c48678e87e0e4e9b1d7e03438f26a82210bbb