2.4.x quick fixes
PATCH 1/1 2.4.x quick fixes
Marcelo, please do a
bk pull bk://kernel.bkbits.net/jgarzik/misc-2.4
This will update the following files:
arch/i386/kernel/pci-irq.c | 1 + drivers/pci/pci.c | 2 +- include/linux/pci.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)
through these ChangeSets:
<[email protected]> (03/08/31 1.1106)
[BK] ignore auto-generated files lib/{crc32table.h,gen_crc32table}
<[email protected]> (03/08/31 1.1105)
[PCI] fix export of pdev_set_mwi/pci_generic_prep_mwi
Missed in recent PCI MWI change.
<[email protected]> (03/08/31 1.1104)
[ia32] add PCI id for VIA irq router
Noticed by Sebastian Reichelt.
arch/i386/kernel/pci-irq.c +1 -0
@@ -610,6 +610,7 @@case PCI_DEVICE_ID_VIA_82C586_0 :case PCI_DEVICE_ID_VIA_82C596 :case PCI_DEVICE_ID_VIA_82C686 : +case PCI_DEVICE_ID_VIA_8231 :/* FIXME: add new ones for 8233/5 */ r->name ="VIA" ; r->get = pirq_via_get;
drivers/pci/pci.c +1 -1
@@ -2151,7 +2151,7 @@EXPORT_SYMBOL (pci_set_master);EXPORT_SYMBOL (pci_set_mwi);EXPORT_SYMBOL (pci_clear_mwi); -EXPORT_SYMBOL (pdev_set_mwi); +EXPORT_SYMBOL (pci_generic_prep_mwi);EXPORT_SYMBOL (pci_set_dma_mask);EXPORT_SYMBOL (pci_dac_set_dma_mask);EXPORT_SYMBOL (pci_assign_resource);
include/linux/pci.h +1 -1
@@ -628,7 +628,7 @@#define HAVE_PCI_SET_MWI int pci_set_mwi (struct pci_dev *dev);void pci_clear_mwi (struct pci_dev *dev); -int pdev_set_mwi (struct pci_dev *dev); +int pci_generic_prep_mwi (struct pci_dev *dev);int pci_set_dma_mask (struct pci_dev *dev,u64 mask);int pci_dac_set_dma_mask (struct pci_dev *dev,u64 mask);int pci_assign_resource (struct pci_dev *dev,int i);
Quoted 12 lines · Jeff Garzik
Marcelo, please do a
bk pull bk://kernel.bkbits.net/jgarzik/misc-2.4
This will update the following files:
arch/i386/kernel/pci-irq.c | 1 + drivers/pci/pci.c | 2 +- include/linux/pci.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)
Against pre2, this is missing to build the thing:
drivers/pci/pci.c renamed from drivers/pci/pci.c.orig +3 -3
@@ -908,7 +908,7 @@ }/** -* pdev_set_mwi - arch helper function for pcibios_set_mwi +* pci_generic_prep_mwi - arch helper function for pcibios_set_mwi * @dev: the PCI device for which MWI is enabled * * Helper function for implementation the arch-specific pcibios_set_mwi
@@ -918,7 +918,7 @@* RETURNS: An appriopriate -ERRNO error value on eror, or zero for success. */ int -pdev_set_mwi (struct pci_dev *dev) +pci_generic_prep_mwi (struct pci_dev *dev) {int rc =0 ;u8 cache_size;
@@ -966,7 +966,7 @@#ifdef HAVE_ARCH_PCI_MWI rc =pcibios_set_mwi (dev);#else - rc =pdev_set_mwi (dev); + rc =pci_generic_prep_mwi (dev);#endif if (rc)
Signature · 4 lines
J.A. Magallon <[email protected]> \ Software is like sex: werewolf.able.es \ It's better when it's free Mandrake Linux release 9.2 (Cooker) for i586 Linux 2.4.23-pre2-jam1m (gcc 3.3.1 (Mandrake Linux 9.2 3.3.1-1mdk))
drivers/pci/pci.c
Quoted 19 lines · J.A. Magallon
Quoted 11 lines · Jeff Garzik
Marcelo, please do a
bk pull bk://kernel.bkbits.net/jgarzik/misc-2.4
This will update the following files:
arch/i386/kernel/pci-irq.c | 1 + drivers/pci/pci.c | 2 +- include/linux/pci.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)Against pre2, this is missing to build the thing:
drivers/pci/pci.c renamed from drivers/pci/pci.c.orig +0
-0
Already fixed. Check out the 2.4 BK snapshots for the fixes, until -pre3 is out.
Thanks,
Jeff