Commits · 8f0f592db3b997b57fbdf6c852d84f982e0c3428 · nexedi / linux

12 Nov, 2004 24 commits

Merge kroah.com:/home/greg/linux/BK/bleed-2.6 · 8f0f592d
Greg Kroah-Hartman authored Nov 11, 2004
```
into kroah.com:/home/greg/linux/BK/pci-2.6
```
8f0f592d
[PATCH] prep_pci.c: replace pci_find_device with pci_get_device · 27ab3d70
Hanna V. Linder authored Nov 11, 2004
```
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
```
27ab3d70
[PATCH] pplus.c: replace pci_find_device with pci_get_device · 97b8b774
Hanna V. Linder authored Nov 11, 2004
```
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
```
97b8b774

[PATCH] pmac_pci.c: replace pci_find_device with pci_get_device · b36d9bf7

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I've replaced it with pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>

b36d9bf7

[PATCH] pcore.c: replace pci_find_device with pci_get_device · c1fdbf7c

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I've replaced it with pci_get_device
and pci_dev_put.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

c1fdbf7c

[PATCH] mcpn765.c: replace pci_find_device with pci_get_device · c1d746dd

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I've replaced it with pci_get_device
and pci_dev_put.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

c1d746dd

[PATCH] prpmc750.c: replace pci_find_device with pci_get_device · 44be43c6

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I've replaced it with pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

44be43c6

[PATCH] sandpoint.c: replace pci_find_device with pci_get_device · c2826904

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I've replaced it with pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

c2826904

[PATCH] fixups-dreamcast.c: replace pci_find_device with pci_get_device · 11f5630a

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I've replaced it with pci_get_device
and pci_dev_put.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

11f5630a

[PATCH] ebus.c: replace pci_find_device with pci_get_device · 581484d2
Hanna V. Linder authored Nov 11, 2004
```
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
```
581484d2

[PATCH] isa.c: replace pci_find_device with pci_get_device · 991c07fd

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I've replaced it with pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

991c07fd

[PATCH] pci_iommu.c: replace pci_find_device with pci_get_device · 7338a0a7

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I've replaced it with pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

7338a0a7

[PATCH] ret_mb_a_pci.c: replace pci_find_device with pci_get_device · d719a896

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I've replaced it with pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

d719a896

[PATCH] pci-gart.c: replace pci_find_device with pci_get_device · 6e90ef05

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I've replaced it with pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

6e90ef05

[PATCH] sis-agp.c: replace pci_find_device with pci_get_device · 562c0074

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away soon I have converted this file to use
pci_get_device instead. for_each_pci_dev is a macro wrapper around
pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

562c0074

[PATCH] drm_drv.h: replace pci_find_device · 6be9f519

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I've replaced it with pci_get_device.
for_each_pci_dev is a macro wrapper around pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

6be9f519

[PATCH] cmipci.c: convert pci_find_device to pci_get_device · 71ecb262

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I've replaced it with pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

71ecb262

[PATCH] k2.c: replace pci_find_device with pci_get_device · 9acc8a77

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I have replaced this call with
pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

9acc8a77

[PATCH] lopec.c: replace pci_find_device with pci_get_device · 8a5cf25b

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I have replaced this call with
pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

8a5cf25b

[PATCH] matroxfb_base.c: convert pci_find_device to pci_get_device · 48bc3d9b

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I've replaced it with pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

48bc3d9b

[PATCH] gemini_pci.c: replace pci_find_device with for_each_pci_dev · 8206d06e
Hanna V. Linder authored Nov 11, 2004
```
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
```
8206d06e
[PATCH] chrp_pci.c: replace pci_find_device with for_each_pci_dev · af39663e
Hanna V. Linder authored Nov 11, 2004
```
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
```
af39663e

[PATCH] PCI: small PCI probe patch for odd 64 bit BARs · e0d317fd

Tim Hockin authored Nov 11, 2004

On Thu, Nov 11, 2004 at 09:54:19AM -0800, Greg KH wrote:
> I'll wait till you test this on 2.6 before applying it.

OK.  Tested now on real hardware in 32 bit and 64 bit kernels.  32 bit
found another dumbness, that we can fix up.

Some PCI bridges default their UPPER prefetch windows to an unused state
of base > limit.  We should not use those values if we find that.  It
might be nice to reprogram them to 0, in fact.

Yes, BIOS should fix that up, but apparently, some do not.
Signed-Off-By: Tim Hockin <thockin@google.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

e0d317fd

[PATCH] rivafb: stricter memory ordering · 9ba41447

Guido Guenther authored Nov 11, 2004

The more relaxed memory ordering od the __raw_{write,read}b broke things
on ppc in the recent rivafb cleanups.

[ Uglyness alert: only the 8-bit accesses are more strongly serialized. 
  The 16- and 32-bit ones have always been relaxed. Gaah. ]
Signed-off-by: Guido Guenther <agx@sigxcpu.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

9ba41447

11 Nov, 2004 16 commits

[PATCH] fakephp: add pci bus rescan ability · b48838a9

Jan Dittmer authored Nov 11, 2004

This adds the ability to rescan the pci bus for newly inserted,
reprogrammed or previously disabled pci devices.
To initiate a rescan you need to write '1' to any of the
/sys/bus/pci/slots/*/power control files. No known pci devices
will be touched.
Additionally this fixes a bug, when someone tries to disable
a device with subfunctions. The subfunctions will be disabled first now.

Short demo:
 # modprobe fakephp
 # ls /sys/bus/pci/slots | grep "0000:04"
0000:04:02.0
0000:04:02.1
0000:04:02.2
0000:04:03.0
0000:04:03.1
 # echo -n 0 > /sys/bus/pci/slots/0000\:04\:02.0/power
 # ls /sys/bus/pci/slots | grep "0000:04"
0000:04:03.0
0000:04:03.1
 # echo -n 1 > /sys/bus/pci/slots/0000\:03\:01.0/power
 # ls /sys/bus/pci/slots | grep "0000:04"
0000:04:02.0
0000:04:02.1
0000:04:02.2
0000:04:03.0
0000:04:03.1
 # lspci | grep "0000:04"
0000:04:02.0 Multimedia audio controller: Creative Labs SB Audigy (rev 03)
0000:04:02.1 Input device controller: Creative Labs SB Audigy MIDI/Gameport (rev 03)
0000:04:02.2 FireWire (IEEE 1394): Creative Labs SB Audigy FireWire Port
0000:04:03.0 SCSI storage controller: Adaptec AHA-3960D / AIC-7899A U160/m (rev 01)
0000:04:03.1 SCSI storage controller: Adaptec AHA-3960D / AIC-7899A U160/m (rev 01)
Signed-off-by: Jan Dittmer <jdittmer@ppp0.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

b48838a9

[PATCH] fakephp: introduce pci_bus_add_device · f322f273

Jan Dittmer authored Nov 11, 2004

fakephp needs to add newly discovered devices to the global pci list.
Therefore seperate out the appropriate chunk from pci_bus_add_devices
to pci_bus_add_device to add a single device to sysfs, procfs
and the global device list.
Signed-off-by: Jan Dittmer <jdittmer@ppp0.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

f322f273

merge · 3c80c502
Greg Kroah-Hartman authored Nov 11, 2004

3c80c502
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk · 5240bcbf
Linus Torvalds authored Nov 11, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
5240bcbf

[ARM PATCH] 2230/1: fix generic_fls declaration mismatch · 491c6040

Nicolas Pitre authored Nov 11, 2004

Patch from Nicolas Pitre

The declaration of generic_fls recently changed from
extern inline to static inline.

Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King

491c6040

[ARM PATCH] 2228/1: S3C2410 - dma register updates · 7303625c

Ben Dooks authored Nov 11, 2004

Patch from Ben Dooks

Add register definitions for channel hardware
sources, and update for s3c2440 extra bits.

(should be applied after #2226/1 and #2227/1)

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

7303625c

[ARM PATCH] 2227/1: S3C2410 - export dma symbols to modules · a273a739

Ben Dooks authored Nov 11, 2004

Patch from Ben Dooks

Added EXPORT_SYMBOL() to appropriate routines

(should be applied after Patch 2226/1)

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

a273a739

[ARM PATCH] 2226/1: S3C2410 - dma system device · ae40b489

Ben Dooks authored Nov 11, 2004

Patch from Ben Dooks

Add sysfs class and devices for s3c24xx-dma code, and
add simple pm suspend code to ensure all channels are
stopped before suspending

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

ae40b489

PCI Hotplug: fix up remaining MODULE_PARAM usage in pci hotplug drivers · 435883d2
Greg Kroah-Hartman authored Nov 10, 2004
```
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
```
435883d2
Merge bk://gkernel.bkbits.net/net-drivers-2.6 · 5c79e500
Linus Torvalds authored Nov 10, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
5c79e500

[PATCH] Fix for 802.3ad shutdown issue · d8158e53

Andrew Morton authored Nov 11, 2004

The patch below fixes a problem with shutting down 802.3ad bonds on the 2.6
kernel.  Taking the interface down or removing the module causes a stack
dump if spinlock debugging is enabled.  This patch was generated from the
2.6.9 kernel.

This patch has been peer reviewed by our Linux software engineering team,
and the fix has been verified by our test labs.
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

d8158e53

[PATCH] ixgb: fix ixgb_intr looping checks · f5c830f6

Andrew Morton authored Nov 11, 2004

This patch undoes a change that we believe will impact performance
adversely, by creating possibly too long a delay between servicing
completions.  The comment pretty much explains it.  We need to call both
cleanup routines each pass through the loop, this time we have a comment
explaining why.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

f5c830f6

[PATCH] E1000 stop working after resume · d993b31a

Andrew Morton authored Nov 11, 2004

Obviously pci_enable_device should be called after pci_restore_state.
Signed-off-by: Li Shaohua <shaohua.li@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

d993b31a

[PATCH] netpoll: fix null ifa_list pointer dereference · 70714ee9

Andrew Morton authored Nov 11, 2004

This fixes a bug where netpoll can dereference a null ifa_list pointer when
not supplied an IP address at module load and the interface is up but no IP
is configured.

Bonus: unrelated netif_running cleanup

Signed-off by: Jeff Moyer <jmoyer@redhat.com>
Signed-off by: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

70714ee9

Revert recent EDD changes to use EXTENDED READ comand and CONFIG_EDD_SKIP_MBR · 2323f9d4

Linus Torvalds authored Nov 10, 2004

It seems to result in unexplained memory corruption. Matt is working on it.

Cset exclude: Matt_Domsch@dell.com[torvalds]|ChangeSet|20041020153622|50713

2323f9d4

[PATCH] limit CONFIG_LEGACY_PTY_COUNT · 57f28fbf

Andrew Morton authored Nov 10, 2004

Limit the number of legacy ptys to 256.  pty_line_name() isn't capable of
generating more than 256 unique names.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

57f28fbf