]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
UBUNTU: SAUCE: update pseries_setup_rfi_flush() capitalization to upstream
authorMauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
Mon, 7 May 2018 22:35:33 +0000 (19:35 -0300)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 15 May 2018 05:35:26 +0000 (07:35 +0200)
This is present in upstream commit:
  8989d56 powerpc/pseries: Query hypervisor for RFI flush settings

This will help with future backports.

Signed-off-by: Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
CVE-2018-3639 (powerpc)

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
arch/powerpc/platforms/pseries/setup.c

index 74f4b0fe7decebf74f109d20ae8c3c351a4b190f..5dba8e02c11ae93ff2d1e78da6355d503341527a 100644 (file)
@@ -455,7 +455,7 @@ static void __init find_and_init_phbs(void)
        of_pci_check_probe_only();
 }
 
-static void pSeries_setup_rfi_flush(void)
+static void pseries_setup_rfi_flush(void)
 {
        struct h_cpu_char_result result;
        enum l1d_flush_type types;
@@ -505,7 +505,7 @@ static void __init pSeries_setup_arch(void)
 
        fwnmi_init();
 
-       pSeries_setup_rfi_flush();
+       pseries_setup_rfi_flush();
 
        /* By default, only probe PCI (can be overridden by rtas_pci) */
        pci_add_flags(PCI_PROBE_ONLY);