x86/amd_nb, char/amd64-agp: Use amd_nb_num() accessor
Subsystems (2)
Borislav Petkov
maintainerPATCH 1/1 x86/amd_nb, char/amd64-agp: Use amd_nb_num() accessor
From: Borislav Petkov <[email protected]>
... to find whether there are northbridges present on the system. This converts the last forgotten user and therefore, unexport amd_nb_misc_ids[] too.
Signed-off-by Borislav Petkov <[email protected]>
Cc Michal Kubecek <[email protected]>
Cc Yazen Ghannam <[email protected]>
--- arch/x86/include/asm/amd_nb.h | 1 - arch/x86/kernel/amd_nb.c | 4 +--- drivers/char/agp/amd64-agp.c | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-)
arch/x86/include/asm/amd_nb.h +0 -1
@@ -12,7 +12,6 @@ struct amd_nb_bus_dev_range {u8 dev_limit; }; -extern const struct pci_device_id amd_nb_misc_ids[];extern const struct amd_nb_bus_dev_range amd_nb_bus_dev_ranges[];extern bool early_is_amd_nb (u32 value);
arch/x86/kernel/amd_nb.c +1 -3
@@ -36,10 +36,9 @@ static const struct pci_device_id amd_root_ids[] = { {} }; -#define PCI_DEVICE_ID_AMD_CNB17H_F4 0x1704 -const struct pci_device_id amd_nb_misc_ids[] = { +static const struct pci_device_id amd_nb_misc_ids[] = { {PCI_DEVICE (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_K8_NB_MISC ) }, {PCI_DEVICE (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_10H_NB_MISC ) }, {PCI_DEVICE (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_15H_NB_F3 ) },
@@ -56,7 +55,6 @@ const struct pci_device_id amd_nb_misc_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F3) }, {} }; -EXPORT_SYMBOL_GPL (amd_nb_misc_ids);static const struct pci_device_id amd_nb_link_ids[] = { {PCI_DEVICE (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_15H_NB_F4 ) },
drivers/char/agp/amd64-agp.c +1 -1
@@ -775,7 +775,7 @@ int __init agp_amd64_init(void) }/* First check that we have at least one AMD64 NB */ -if (!pci_dev_present (amd_nb_misc_ids)) { +if (!amd_nb_num ()) {pci_unregister_driver (&agp_amd64_pci_driver);return -ENODEV ; }
Signature · 1 line
2.21.0
The following commit has been merged into the x86/cpu branch of tip:
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 19d33357ecdf6f4d591b4c17f119bacd6ae834eb Gitweb: https://git.kernel.org/tip/19d33357ecdf6f4d591b4c17f119bacd6ae834eb Author: Borislav Petkov <[email protected]> AuthorDate: Mon, 16 Mar 2020 13:23:21 +01:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Tue, 17 Mar 2020 10:25:58 +01:00
x86/amd_nb, char/amd64-agp: Use amd_nb_num() accessor
... to find whether there are northbridges present on the system. Convert the last forgotten user and therefore, unexport amd_nb_misc_ids[] too.
Signed-off-by Borislav Petkov <[email protected]>
Cc Michal Kubecek <[email protected]>
Cc Yazen Ghannam <[email protected]>
--- arch/x86/include/asm/amd_nb.h | 1 - arch/x86/kernel/amd_nb.c | 4 +--- drivers/char/agp/amd64-agp.c | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-)
arch/x86/include/asm/amd_nb.h +0 -1
@@ -12,7 +12,6 @@ struct amd_nb_bus_dev_range {u8 dev_limit; }; -extern const struct pci_device_id amd_nb_misc_ids[];extern const struct amd_nb_bus_dev_range amd_nb_bus_dev_ranges[];extern bool early_is_amd_nb (u32 value);
arch/x86/kernel/amd_nb.c +1 -3
@@ -36,10 +36,9 @@ static const struct pci_device_id amd_root_ids[] = { {} }; -#define PCI_DEVICE_ID_AMD_CNB17H_F4 0x1704 -const struct pci_device_id amd_nb_misc_ids[] = { +static const struct pci_device_id amd_nb_misc_ids[] = { {PCI_DEVICE (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_K8_NB_MISC ) }, {PCI_DEVICE (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_10H_NB_MISC ) }, {PCI_DEVICE (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_15H_NB_F3 ) },
@@ -56,7 +55,6 @@ const struct pci_device_id amd_nb_misc_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F3) }, {} }; -EXPORT_SYMBOL_GPL (amd_nb_misc_ids);static const struct pci_device_id amd_nb_link_ids[] = { {PCI_DEVICE (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_15H_NB_F4 ) },
drivers/char/agp/amd64-agp.c +1 -1
@@ -775,7 +775,7 @@ int __init agp_amd64_init(void) }/* First check that we have at least one AMD64 NB */ -if (!pci_dev_present (amd_nb_misc_ids)) { +if (!amd_nb_num ()) {pci_unregister_driver (&agp_amd64_pci_driver);return -ENODEV ; }