From 54cd991725079fdce550e86f2303ece870203386 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 8 Sep 2014 19:55:36 +0000 Subject: kernel: drop 3.9 support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki SVN-Revision: 42452 --- ...__weak-annotation-from-pcibios_get_phb_of.patch | 40 ---------------------- 1 file changed, 40 deletions(-) delete mode 100644 target/linux/generic/patches-3.9/031-PCI-Remove-__weak-annotation-from-pcibios_get_phb_of.patch (limited to 'target/linux/generic/patches-3.9/031-PCI-Remove-__weak-annotation-from-pcibios_get_phb_of.patch') diff --git a/target/linux/generic/patches-3.9/031-PCI-Remove-__weak-annotation-from-pcibios_get_phb_of.patch b/target/linux/generic/patches-3.9/031-PCI-Remove-__weak-annotation-from-pcibios_get_phb_of.patch deleted file mode 100644 index 20785dda14..0000000000 --- a/target/linux/generic/patches-3.9/031-PCI-Remove-__weak-annotation-from-pcibios_get_phb_of.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 10629d711ed780470937ecda50d9ffa0e925a4ee Mon Sep 17 00:00:00 2001 -From: Bjorn Helgaas -Date: Wed, 10 Apr 2013 09:56:54 -0600 -Subject: [PATCH 1/2] PCI: Remove __weak annotation from - pcibios_get_phb_of_node decl - -The __weak annotation on the pcibios_get_phb_of_node() declaration -causes *every* definition to be marked "weak." The linker then -selects one based on link order, which may be the wrong one. - -Gabor found that on MIPS, the linker selected the generic implementation -from drivers/pci even though arch/mips supplied a definition without the -__weak annotation: - -$ mipsel-openwrt-linux-readelf -s arch/mips/pci/built-in.o \ - drivers/pci/built-in.o vmlinux.o | grep pcibios_get_phb_of_node - 86: 0000046c 12 FUNC WEAK DEFAULT 2 pcibios_get_phb_of_node - 1430: 00012e2c 104 FUNC WEAK DEFAULT 2 pcibios_get_phb_of_node - 31898: 0017e4ec 104 FUNC WEAK DEFAULT 2 pcibios_get_phb_of_node - -This removes the __weak annotation from the pcibios_get_phb_of_node() -declaration so arch-specific non-weak implementations work reliably. - -Suggested-by: Gabor Juhos -Signed-off-by: Bjorn Helgaas ---- - include/linux/pci.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/include/linux/pci.h -+++ b/include/linux/pci.h -@@ -1824,7 +1824,7 @@ extern void pci_set_bus_of_node(struct p - extern void pci_release_bus_of_node(struct pci_bus *bus); - - /* Arch may override this (weak) */ --extern struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus); -+extern struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus); - - static inline struct device_node * - pci_device_to_OF_node(const struct pci_dev *pdev) -- cgit v1.2.3