public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [BK PATCH] PCI update for 2.6.11
@ 2005-03-04 20:53 Greg KH
  2005-03-04 20:53 ` [PATCH] convert pci_dev->slot_name usage to pci_name() Greg KH
  0 siblings, 1 reply; 23+ messages in thread
From: Greg KH @ 2005-03-04 20:53 UTC (permalink / raw)
  To: torvalds, akpm; +Cc: linux-kernel

Hi,

Here are some PCI and PCI Hotplug patches for 2.6.11.  All of these have
been in the past few -mm releases.

It includes a big pci.ids update.  Hm, I need to mark that thing as
"will be deleted in the future" soon, as we are tired of keeping that
around.  Will do that in the next round of pci patches.

Please pull from:
	bk://kernel.bkbits.net/gregkh/linux/pci-2.6

thanks,

greg k-h

p.s. I'll send these as patches in response to this email to lkml for
those who want to see them.


 Documentation/pci.txt                |    8 
 arch/frv/mb93090-mb00/pci-frv.c      |    4 
 arch/frv/mb93090-mb00/pci-vdk.c      |    6 
 arch/i386/pci/acpi.c                 |   17 
 arch/i386/pci/direct.c               |   12 
 arch/i386/pci/irq.c                  |   73 +-
 arch/i386/pci/mmconfig.c             |    6 
 arch/i386/pci/numa.c                 |   10 
 arch/i386/pci/pcbios.c               |    6 
 arch/ia64/pci/pci.c                  |   69 --
 arch/mips/pmc-sierra/yosemite/ht.c   |    6 
 arch/ppc/kernel/pci.c                |    2 
 arch/ppc64/kernel/pci.c              |   16 
 arch/sh/drivers/pci/fixups-sh03.c    |    4 
 arch/sh/drivers/pci/pci-sh7751.c     |    8 
 arch/sh/drivers/pci/pci-st40.c       |    2 
 arch/sh64/kernel/pci_sh5.c           |    2 
 arch/sh64/kernel/pcibios.c           |    4 
 arch/sparc64/kernel/pci.c            |    6 
 arch/x86_64/pci/mmconfig.c           |    8 
 drivers/char/agp/generic.c           |    2 
 drivers/char/agp/sis-agp.c           |    2 
 drivers/ide/pci/sgiioc4.c            |    6 
 drivers/isdn/hisax/hisax_fcpcipnp.c  |    2 
 drivers/media/common/saa7146_video.c |    2 
 drivers/media/video/meye.c           |    2 
 drivers/media/video/zoran_driver.c   |    2 
 drivers/net/defxx.c                  |    2 
 drivers/net/r8169.c                  |    8 
 drivers/net/s2io.c                   |    4 
 drivers/net/sk98lin/skethtool.c      |    2 
 drivers/net/sk98lin/skge.c           |    2 
 drivers/net/tulip/tulip.h            |    2 
 drivers/net/typhoon.c                |    2 
 drivers/net/via-velocity.c           |    2 
 drivers/net/wan/wanxl.c              |   38 -
 drivers/parisc/dino.c                |    5 
 drivers/pci/hotplug/ibmphp_pci.c     |    3 
 drivers/pci/hotplug/pciehp_ctrl.c    |    3 
 drivers/pci/hotplug/pciehprm_acpi.c  |    3 
 drivers/pci/hotplug/shpchprm_acpi.c  |    3 
 drivers/pci/msi.c                    |   13 
 drivers/pci/pci-driver.c             |    1 
 drivers/pci/pci-sysfs.c              |    2 
 drivers/pci/pci.c                    |    4 
 drivers/pci/pci.ids                  | 1137 +++++++++++++++++++++++++++++++----
 drivers/pci/pcie/Kconfig             |    1 
 drivers/pci/pcie/portdrv_pci.c       |    2 
 drivers/pci/probe.c                  |    9 
 drivers/pci/proc.c                   |   20 
 drivers/pci/quirks.c                 |   13 
 drivers/pci/setup-res.c              |    4 
 drivers/pcmcia/yenta_socket.c        |    2 
 drivers/scsi/qla2xxx/qla_os.c        |   28 
 include/asm-alpha/pci.h              |   11 
 include/asm-ia64/pci.h               |    9 
 include/asm-mips/pci.h               |   11 
 include/asm-ppc/pci.h                |    3 
 include/asm-ppc64/pci.h              |    4 
 include/asm-sparc64/pci.h            |    5 
 include/linux/pci.h                  |   11 
 include/linux/pci_ids.h              |    8 
 62 files changed, 1255 insertions(+), 409 deletions(-)
-----


<c-d.hailfinger.devel.2005:gmx.net>:
  o PCI: pci.ids update
  o pci/quirks.c: unhide SMBus device on Samsung P35 laptop

<muneda.takahiro:jp.fujitsu.com>:
  o PCI: fix pci_remove_legacy_files() crash

Alexander Nyberg:
  o PCI: fix hotplug double free

Andi Kleen:
  o PCI: allow x86_64 to do pci express

Benjamin Herrenschmidt:
  o PCI: Apple PCI IDs update

Bjorn Helgaas:
  o PCI: tone down pci=routeirq message
  o PCI: pci_raw_ops should use unsigned args
  o PCI: NUMA-Q PCI config access arg validation

Brian King:
  o PCI: Dynids - passing driver data

Christophe Lucas:
  o drivers/pci/*: convert to pci_register_driver

Dave Jones:
  o Remove pci_dev->slot_name
  o convert pci_dev->slot_name usage to pci_name()

Dely Sy:
  o PCI Hotplug: Fix OSHP calls in shpchp and pciehp drivers

Greg Kroah-Hartman:
  o PCI: remove pci_find_device usage from pci sysfs code

Jean Delvare:
  o PCI: One more Asus SMBus quirk
  o PCI: Add PCI quirk for SMBus on the Toshiba Satellite A40

Mark F. Haigh:
  o arch/i386/kernel/pci/irq.c:  Wrong message output

Matthew Wilcox:
  o PCI: Make pci_claim_resource __devinit
  o PCI: pci_proc_domain

Roland Dreier:
  o PCI: clean up the msi api

Rolf Eike Beer:
  o PCI Hotplug: Remove unneeded instructions from ibmphp_pci.c


^ permalink raw reply	[flat|nested] 23+ messages in thread
* [PATCH] PCI: fix pci_remove_legacy_files() crash
@ 2005-02-04  3:28 MUNEDA Takahiro
  2005-02-04 16:45 ` Jesse Barnes
  2005-02-08  0:19 ` Greg KH
  0 siblings, 2 replies; 23+ messages in thread
From: MUNEDA Takahiro @ 2005-02-04  3:28 UTC (permalink / raw)
  To: Greg KH, John Rose, Jesse Barnes; +Cc: muneda.takahiro, LKML, linux-pci

Hi,

The legacy_io which is the member of pci_bus struct might be
NULL. It should be checked.

This patch checks 'b->legacy_io', NULL or not.

Signed-off-by: MUNEDA Takahiro <muneda.takahiro@jp.fujitsu.com>

---

 probe.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff -Npur a/drivers/pci/probe.c b/drivers/pci/probe.c
--- a/drivers/pci/probe.c	2005-01-31 13:31:27.000000000 +0900
+++ b/drivers/pci/probe.c	2005-02-03 11:21:51.000000000 +0900
@@ -64,9 +64,11 @@ static void pci_create_legacy_files(stru

 void pci_remove_legacy_files(struct pci_bus *b)
 {
-	class_device_remove_bin_file(&b->class_dev, b->legacy_io);
-	class_device_remove_bin_file(&b->class_dev, b->legacy_mem);
-	kfree(b->legacy_io); /* both are allocated here */
+	if (b->legacy_io) {
+		class_device_remove_bin_file(&b->class_dev, b->legacy_io);
+		class_device_remove_bin_file(&b->class_dev, b->legacy_mem);
+		kfree(b->legacy_io); /* both are allocated here */
+	}
 }
 #else /* !HAVE_PCI_LEGACY */
 static inline void pci_create_legacy_files(struct pci_bus *bus) { return; }


^ permalink raw reply	[flat|nested] 23+ messages in thread
end of thread, other threads:[~2005-03-05  4:35 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-03-04 20:53 [BK PATCH] PCI update for 2.6.11 Greg KH
2005-03-04 20:53 ` [PATCH] convert pci_dev->slot_name usage to pci_name() Greg KH
2005-03-04 20:53   ` [PATCH] Remove pci_dev->slot_name Greg KH
2005-03-04 20:53     ` [PATCH] PCI Hotplug: Remove unneeded instructions from ibmphp_pci.c Greg KH
2005-03-04 20:53       ` [PATCH] PCI: pci_proc_domain Greg KH
2005-03-04 20:53         ` [PATCH] PCI: Make pci_claim_resource __devinit Greg KH
2005-03-04 20:53           ` [PATCH] PCI: fix pci_remove_legacy_files() crash Greg KH
2005-03-04 20:53             ` [PATCH] PCI: NUMA-Q PCI config access arg validation Greg KH
2005-03-04 20:53               ` [PATCH] PCI: pci_raw_ops should use unsigned args Greg KH
2005-03-04 20:53                 ` [PATCH] arch/i386/kernel/pci/irq.c: Wrong message output Greg KH
2005-03-04 20:53                   ` [PATCH] PCI: Dynids - passing driver data Greg KH
2005-03-04 20:53                     ` [PATCH] drivers/pci/*: convert to pci_register_driver Greg KH
2005-03-04 20:53                       ` [PATCH] PCI Hotplug: Fix OSHP calls in shpchp and pciehp drivers Greg KH
2005-03-04 20:53                         ` [PATCH] PCI: Add PCI quirk for SMBus on the Toshiba Satellite A40 Greg KH
2005-03-04 20:53                           ` [PATCH] PCI: allow x86_64 to do pci express Greg KH
2005-03-04 20:53                             ` [PATCH] pci/quirks.c: unhide SMBus device on Samsung P35 laptop Greg KH
2005-03-04 20:53                               ` [PATCH] PCI: clean up the msi api Greg KH
2005-03-04 21:00   ` [PATCH] convert pci_dev->slot_name usage to pci_name() Jeff Garzik
2005-03-04 21:07     ` Greg KH
2005-03-04 23:00       ` Jeff Garzik
  -- strict thread matches above, loose matches on Subject: below --
2005-02-04  3:28 [PATCH] PCI: fix pci_remove_legacy_files() crash MUNEDA Takahiro
2005-02-04 16:45 ` Jesse Barnes
2005-02-08  0:19 ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox