]> pilppa.com Git - linux-2.6-omap-h63xx.git/log
linux-2.6-omap-h63xx.git
18 years agoMerge branch 'upstream-greg' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git...
Greg Kroah-Hartman [Thu, 24 Aug 2006 08:28:14 +0000 (01:28 -0700)]
Merge branch 'upstream-greg' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

18 years ago[PATCH] sata_via: use old SCR access pattern on vt6420
Tejun Heo [Tue, 22 Aug 2006 16:00:27 +0000 (01:00 +0900)]
[PATCH] sata_via: use old SCR access pattern on vt6420

vt6420 has super-fragile SCR registers which can hang the whole
machine if accessed with the wrong timings.  This patch makes sata_via
use SCR registers only during probing and with the same timings as
before (pre new EH), which is proven to work.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] ata_piix: implement force_pcs module parameter
Tejun Heo [Tue, 22 Aug 2006 12:15:58 +0000 (21:15 +0900)]
[PATCH] ata_piix: implement force_pcs module parameter

This patch implements force_pcs module parameter for ata_piix.  If 1,
PCS is ignored, 2 honored.  As there seem to be quite a few ICHs w/
impaired PCS, this option will be useful for cases where the default
setting doesn't work.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] ata_piix: ignore PCS on ICH5
Tejun Heo [Tue, 22 Aug 2006 12:06:46 +0000 (21:06 +0900)]
[PATCH] ata_piix: ignore PCS on ICH5

There have been a number of reports regarding some ICH5s failing to
detect devices since the PCS handling update.  Analysis shows that
these problems are caused by bogus PCS values from those controllers.

Before the PCS update, the driver didn't honor PCS regs exactly and
probed them in many cases PCS reports no device.  Now that PCS is
honored exactly, these hardware problems are visible.

This patch makes ICH5 ignore PCS.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years agoMerge branch 'upstream-greg' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git...
Greg Kroah-Hartman [Thu, 24 Aug 2006 04:58:48 +0000 (21:58 -0700)]
Merge branch 'upstream-greg' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

18 years agoMerge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
Jeff Garzik [Thu, 24 Aug 2006 04:41:25 +0000 (00:41 -0400)]
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes

18 years ago[PATCH] spectrum_cs: Fix firmware uploading errors
Richard Purdie [Tue, 22 Aug 2006 17:55:44 +0000 (18:55 +0100)]
[PATCH] spectrum_cs: Fix firmware uploading errors

spectrum_cs: Fix the logic so we error when the device is *not* present!

This fixes firmware upload failures which prevent the driver from
working (the bug is also present in 2.6.17).

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] pcnet32: break in 2.6.18-rc1 identified
Don Fry [Tue, 22 Aug 2006 17:22:37 +0000 (10:22 -0700)]
[PATCH] pcnet32: break in 2.6.18-rc1 identified

A change I made for 2.6.17 and another for 2.6.18 do not work on older
pcnet32 chips which I do not have access to.  If the chip is a 79C970 or
79C965, do not try and suspend or check the link status.
I have tested with a 79C970A, 79C971, 79C972, 79C973, 79C975, 79C976,
and 79C978.

Signed-off-by: Don Fry <brazilnut@us.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] xirc2ps_cs: Cannot reset card in atomic context
Joerg Ahrens [Sun, 20 Aug 2006 20:51:57 +0000 (21:51 +0100)]
[PATCH] xirc2ps_cs: Cannot reset card in atomic context

I am using a Xircom CEM33 pcmcia NIC which has occasional hardware problems.
If the netdev watchdog detects a transmit timeout, do_reset is called which
msleeps - this is illegal in atomic context.

This patch schedules the timeout handling as a workqueue item.

Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] Signedness issue in drivers/net/3c515.c
Eric Sesterhenn [Sat, 19 Aug 2006 17:37:57 +0000 (19:37 +0200)]
[PATCH] Signedness issue in drivers/net/3c515.c

while playing with gcc 4.1 -Wextra warnings, I came across this one:

drivers/net/3c515.c:1027: warning: comparison of unsigned expression >= 0 is always true

Since i is unsigned the >= 0 check in the for loop is always true,
so we might spin there forever unless the if condition triggers.
Since i is only used in this loop, this patch changes it to
an integer.

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years agoMerge branch 'for-linus' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/dtor...
Greg Kroah-Hartman [Thu, 24 Aug 2006 04:11:56 +0000 (21:11 -0700)]
Merge branch 'for-linus' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

18 years agoMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
Greg Kroah-Hartman [Thu, 24 Aug 2006 04:08:12 +0000 (21:08 -0700)]
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

18 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
Greg Kroah-Hartman [Thu, 24 Aug 2006 01:08:44 +0000 (18:08 -0700)]
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

18 years ago[POWERPC] hugepage BUG fix
Adam Litke [Fri, 18 Aug 2006 18:22:21 +0000 (11:22 -0700)]
[POWERPC] hugepage BUG fix

On Tue, 2006-08-15 at 08:22 -0700, Dave Hansen wrote:
> kernel BUG in cache_free_debugcheck at mm/slab.c:2748!

Alright, this one is only triggered when slab debugging is enabled.  The
slabs are assumed to be aligned on a HUGEPTE_TABLE_SIZE boundary.  The free
path makes use of this assumption and uses the lowest nibble to pass around
an index into an array of kmem_cache pointers.  With slab debugging turned
on, the slab is still aligned, but the "working" object pointer is not.
This would break the assumption above that a full nibble is available for
the PGF_CACHENUM_MASK.

The following patch reduces PGF_CACHENUM_MASK to cover only the two least
significant bits, which is enough to cover the current number of 4 pgtable
cache types.  Then use this constant to mask out the appropriate part of
the huge pte pointer.

Signed-off-by: Adam Litke <agl@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[SERIAL] sunzilog: Mirror the sunsab serial setup bug fix.
David S. Miller [Wed, 23 Aug 2006 22:53:39 +0000 (15:53 -0700)]
[SERIAL] sunzilog: Mirror the sunsab serial setup bug fix.

Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[SERIAL] sunsab: Fix E250 console with RSC.
Marc Zyngier [Wed, 23 Aug 2006 22:50:57 +0000 (15:50 -0700)]
[SERIAL] sunsab: Fix E250 console with RSC.

This fixes yet another sunsab problem, when console is set to anything
but the first port. The console framework calls sunsab_console_setup
for each port, and we end up setting up a console on a not yet
discovered port, which leads to an Oops. Instead, defer console setup
until the requested port is properly initialized. Tested on an E250
through an RSC console.

Reported by Daniel Smolik <marvin@mydatex.cz>

Signed-off-by: Marc Zyngier <maz@misterjones.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[SCSI] esp: Fix build on SUN4.
David S. Miller [Wed, 23 Aug 2006 22:33:07 +0000 (15:33 -0700)]
[SCSI] esp: Fix build on SUN4.

Noted by Alexey Dobriyan.

Signed-off-by: David S. Miller <davem@davemloft.net>
18 years agoIB/mthca: Update HCA firmware revisions
Michael S. Tsirkin [Tue, 22 Aug 2006 19:45:06 +0000 (22:45 +0300)]
IB/mthca: Update HCA firmware revisions

Update the driver's list of HCA firmware revisions to make sure people
running Sinai firmware older than 1.1.0 get a message suggesting a
firmware upgrade.  Update the Arbel versions as well while we are at it.

Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
18 years ago[PATCH] hostap: Restore antenna selection settings after port reset
Pavel Roskin [Wed, 16 Aug 2006 01:41:39 +0000 (21:41 -0400)]
[PATCH] hostap: Restore antenna selection settings after port reset

Intersil firmware 1.7.4 (and possibly others) loses the antenna
selection settings when the port is reset.

Signed-off-by: David Acker <dacker@roinet.com>
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
18 years ago[PATCH] spectrum_cs: Fix incorrect use of pcmcia_dev_present()
Pavel Roskin [Wed, 16 Aug 2006 00:42:20 +0000 (20:42 -0400)]
[PATCH] spectrum_cs: Fix incorrect use of pcmcia_dev_present()

This bug was introduced during the PCMCIA API conversion and broke
spectrum_cs completely.

Tracked down by Fredrik Tolf <fredrik@dolda2000.com>

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
18 years ago[POWERPC] Fix compile problem without CONFIG_PCI
Li Yang [Wed, 23 Aug 2006 06:13:08 +0000 (14:13 +0800)]
[POWERPC] Fix compile problem without CONFIG_PCI

Compile fails without defining CONFIG_PCI.
The patch fix this.

[paulus@samba.org: Moved of_irq_pci_swizzle so we only need one #ifdef]

Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[POWERPC] Correct masks used in emulating some instructions
Paul Mackerras [Wed, 23 Aug 2006 06:58:39 +0000 (16:58 +1000)]
[POWERPC] Correct masks used in emulating some instructions

When we get an illegal instruction exception, we check to see whether
the instruction is one that we emulate for the user program.  Some of
the masks we use in checking whether the offending instruction is one
we care about didn't have the top bit set, which is the MSB of the
major opcode.  Thus some undefined opcodes could get emulated as other
(defined but unimplemented) instructions.  This corrects the masks.

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[POWERPC] Pass UPIO_TSI flag to 8259 serial driver
Zang Roy-r61911 [Wed, 23 Aug 2006 02:20:27 +0000 (10:20 +0800)]
[POWERPC] Pass UPIO_TSI flag to 8259 serial driver

The patch passes the UPIO_TSI flag to general 8259 serial driver

Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[POWERPC] Update mpc7448hpc2 board irq support using device tree
Zang Roy-r61911 [Wed, 23 Aug 2006 02:19:50 +0000 (10:19 +0800)]
[POWERPC] Update mpc7448hpc2 board irq support using device tree

The patch rewrites mpc7448hpc2 board irq support according to the new
mpic device tree interface.

Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[POWERPC] Fix BootX booting with an initrd
Benjamin Herrenschmidt [Wed, 23 Aug 2006 01:45:12 +0000 (11:45 +1000)]
[POWERPC] Fix BootX booting with an initrd

The bootx_init.c trampoline didn't properly add the ramdisk to the
"reserve map" (list of reserved areas of memory), thus causing all sorts
of failures when using BootX with an initrd. Also fixes a possible
problem if the ramdisk is located before the device-tree passed by
BootX.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[POWERPC] Fix gettimeofday inaccuracies
Nathan Lynch [Wed, 23 Aug 2006 01:36:05 +0000 (20:36 -0500)]
[POWERPC] Fix gettimeofday inaccuracies

There are two problems in the powerpc gettimeofday code which can
cause incorrect results to be returned.

The first is that there is a race between do_gettimeofday and the
timer interrupt:

1. do_gettimeofday does get_tb()

2. decrementer exception on boot cpu which runs timer_recalc_offset,
   which also samples the timebase and updates the do_gtod structure
   with a greater timebase value.

3. do_gettimeofday calls __do_gettimeofday, which leads to the
   negative result from tb_val - temp_varp->tb_orig_stamp.

The second is caused by taking the boot cpu offline, which can cause
the value of tb_last_jiffy to be increased past the currently
available timebase, causing the same underflow as above.

[paulus@samba.org - define and use data_barrier() instead of mb().]

Signed-off-by: Nathan Lynch <ntl@pobox.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[POWERPC] Fix FEC node in 8540 ADS dts
Andy Fleming [Mon, 21 Aug 2006 19:29:28 +0000 (14:29 -0500)]
[POWERPC] Fix FEC node in 8540 ADS dts

* Fixed the FEC node, and its accompanying PHY
* Fixed a spacing issue in the PIC node

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[POWERPC] Rewrite the PPC 86xx IRQ handling to use Flat Device Tree
Jon Loeliger [Fri, 18 Aug 2006 19:30:35 +0000 (14:30 -0500)]
[POWERPC] Rewrite the PPC 86xx IRQ handling to use Flat Device Tree

IRQ setup now comes from the Flat Device Tree and use the new generic
IRQ code.  Fixed the fsl_soc.c IRQ OF interrupt node parsing.
Removed some unused MPC86xx macro definition.

Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
(cherry picked from 919fede6edab94cccb3ca8c1c0b32fa62c9369a5 commit)

18 years ago[POWERPC] Add 85xx DTS files to powerpc
Andy Fleming [Fri, 18 Aug 2006 23:04:34 +0000 (18:04 -0500)]
[POWERPC] Add 85xx DTS files to powerpc

Added the mpc85xx family of dts files to the powerpc tree

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[POWERPC] Fix CDS IRQ handling and PCI code
Andy Fleming [Fri, 18 Aug 2006 01:24:48 +0000 (20:24 -0500)]
[POWERPC] Fix CDS IRQ handling and PCI code

* Fix IRQ support in the 85xx CDS boards so it uses the new
  generic stuff
* Fix PCI IRQ mapping to use the device tree
* Disabled i8259 support to allow the CDS to boot.  This will be
  fixed soon, but the current code doesn't even compile, so this
  is a vast improvement

Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[POWERPC] Fix interrupts on 8540 ADS board
Andy Fleming [Fri, 18 Aug 2006 23:03:08 +0000 (18:03 -0500)]
[POWERPC] Fix interrupts on 8540 ADS board

* Fixed 8540 ADS support for the new irq layer
* Fixed 8540 ADS support for mapping PCI interrupts
* Updated 8540 ADS to use device tree for interrupt assignment
  and sense values

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agoInput: remove dead URLs from Doclumentation/input/joystick.txt
Alexey Dobriyan [Wed, 23 Aug 2006 04:48:33 +0000 (00:48 -0400)]
Input: remove dead URLs from Doclumentation/input/joystick.txt

Closes #2804.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
18 years agoInput: psmouse - fix Intellimouse 4.0 initialization
Pozsar Balazs [Wed, 23 Aug 2006 04:48:03 +0000 (00:48 -0400)]
Input: psmouse - fix Intellimouse 4.0 initialization

Revert the superfluous initilization causing some mice become jumpy.

Signed-off-by: Pozsar Balazs <pozsy@uhulinux.hu>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
18 years agoInput: wistron - fix crash due to referencing __initdata
Dmitry Torokhov [Wed, 23 Aug 2006 04:47:39 +0000 (00:47 -0400)]
Input: wistron - fix crash due to referencing __initdata

Remove __initdata markings from keymaps as they are used during
normal driver operations.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
18 years agoInput: atkbd - fix overrun in atkbd_set_repeat_rate()
Florin Malita [Wed, 23 Aug 2006 04:45:33 +0000 (00:45 -0400)]
Input: atkbd - fix overrun in atkbd_set_repeat_rate()

This was introduced in commit 3d0f0fa0cb554541e10cb8cb84104e4b10828468:
bounds checking is performed against period[32] while indexing delay[4].

Spotted by Coverity, CID 1376.

Signed-off-by: Florin Malita <fmalita@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
18 years agoMerge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Greg Kroah-Hartman [Tue, 22 Aug 2006 22:12:58 +0000 (15:12 -0700)]
Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

18 years ago[SPARC64]: Fix pfn_pte() build failure.
David S. Miller [Mon, 21 Aug 2006 22:27:16 +0000 (15:27 -0700)]
[SPARC64]: Fix pfn_pte() build failure.

The "%uhi" needs to be "%%uhi" because we want a real
"%" character in the assembler here, instead of an
assembler variable expansion.

Aparently older GCCs were more liberal and interpreted
this %-letter as a literal "%" for whatever reason.

Based upon a build failure report from Meelis Roos.

Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[TEXTSEARCH]: Fix Boyer Moore initialization bug
Michael Rash [Tue, 22 Aug 2006 07:45:22 +0000 (00:45 -0700)]
[TEXTSEARCH]: Fix Boyer Moore initialization bug

The pattern is set after trying to compute the prefix table, which tries
to use it. Initialize it before calling compute_prefix_tbl, make
compute_prefix_tbl consistently use only the data from struct ts_bm
and remove the now unnecessary arguments.

Signed-off-by: Michael Rash <mbr@cipherdyne.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[TCP]: Limit window scaling if window is clamped.
Stephen Hemminger [Tue, 22 Aug 2006 07:06:11 +0000 (00:06 -0700)]
[TCP]: Limit window scaling if window is clamped.

This small change allows for easy per-route workarounds for broken hosts or
middleboxes that are not compliant with TCP standards for window scaling.
Rather than having to turn off window scaling globally. This patch allows
reducing or disabling window scaling if window clamp is present.

Example: Mark Lord reported a problem with 2.6.17 kernel being unable to
access http://www.everymac.com

# ip route add 216.145.246.23/32 via 10.8.0.1 window 65535

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[NETFILTER]: arp_tables: fix table locking in arpt_do_table
Patrick McHardy [Mon, 21 Aug 2006 22:31:08 +0000 (15:31 -0700)]
[NETFILTER]: arp_tables: fix table locking in arpt_do_table

table->private might change because of ruleset changes, don't use it
without holding the lock.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years agoelv_unregister: fix possible crash on module unload
Oleg Nesterov [Tue, 22 Aug 2006 17:22:13 +0000 (21:22 +0400)]
elv_unregister: fix possible crash on module unload

An exiting task or process which didn't do I/O yet have no io context,
elv_unregister() should check it is not NULL.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Acked-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years agoFix possible UDF deadlock and memory corruption (CVE-2006-4145)
Jan Kara [Tue, 15 Aug 2006 11:56:26 +0000 (13:56 +0200)]
Fix possible UDF deadlock and memory corruption (CVE-2006-4145)

UDF code is not really ready to handle extents larger that 1GB. This is
the easy way to forbid creating those.

Also truncation code did not count with the case when there are no
extents in the file and we are extending the file.

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years agoFix sctp privilege elevation (CVE-2006-3745)
Sridhar Samudrala [Tue, 22 Aug 2006 18:50:39 +0000 (11:50 -0700)]
Fix sctp privilege elevation (CVE-2006-3745)

sctp_make_abort_user() now takes the msg_len along with the msg
so that we don't have to recalculate the bytes in iovec.
It also uses memcpy_fromiovec() so that we don't go beyond the
length allocated.

It is good to have this fix even if verify_iovec() is fixed to
return error on overflow.

Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] ata_piix: fix ghost device probing by honoring PCS present bits
Tejun Heo [Sun, 20 Aug 2006 08:56:38 +0000 (17:56 +0900)]
[PATCH] ata_piix: fix ghost device probing by honoring PCS present bits

Move out PCS handling from piix_sata_prereset() into
piix_sata_present_mask() and use it from newly implemented
piix_sata_softreset().  Class codes for devices which are indicated to
be absent by PCS are cleared to ATA_DEV_NONE.  This fixes ghost device
problem reported on ICH6 and 7.

This patch moves PCS handling from prereset to softreset, which makes
two behavior changes.

* perform softreset even when PCS indicates no device
* PCS handling is repeated before retrying softresets due to reset
  failures.

Both behavior changes are intended and more consistent with how other
drivers behave.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years agoMerge gregkh@master.kernel.org:/home/rmk/linux-2.6-arm
Greg Kroah-Hartman [Mon, 21 Aug 2006 21:38:51 +0000 (14:38 -0700)]
Merge gregkh@master.kernel.org:/home/rmk/linux-2.6-arm

18 years agoMerge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
Greg Kroah-Hartman [Mon, 21 Aug 2006 17:24:02 +0000 (10:24 -0700)]
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block

18 years ago[PATCH] cfq_cic_link: fix usage of wrong cfq_io_context
Oleg Nesterov [Mon, 21 Aug 2006 06:36:12 +0000 (08:36 +0200)]
[PATCH] cfq_cic_link: fix usage of wrong cfq_io_context

Obviously, cfq_cic_link() shouldn't free a just allocated cfq_io_context?
The dead key is from __cic, so drop that.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Jens Axboe <axboe@suse.de>
18 years ago[PATCH] uninline ioprio_best()
Oleg Nesterov [Mon, 21 Aug 2006 08:02:50 +0000 (10:02 +0200)]
[PATCH] uninline ioprio_best()

Saves 376 bytes (5 callers) for me.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Jens Axboe <axboe@suse.de>
18 years ago[PATCH] Fix current_io_context() vs set_task_ioprio() race
Oleg Nesterov [Mon, 21 Aug 2006 06:34:15 +0000 (08:34 +0200)]
[PATCH] Fix current_io_context() vs set_task_ioprio() race

I know nothing about io scheduler, but I suspect set_task_ioprio() is not safe.

current_io_context() initializes "struct io_context", then sets ->io_context.
set_task_ioprio() running on another cpu may see the changes out of order, so
->set_ioprio(ioc) may use io_context which was not initialized properly.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Jens Axboe <axboe@suse.de>
18 years ago[PATCH] sys_ioprio_set: minor do_each_thread+break fix
Oleg Nesterov [Mon, 21 Aug 2006 06:33:23 +0000 (08:33 +0200)]
[PATCH] sys_ioprio_set: minor do_each_thread+break fix

From include/linux/sched.h:

         * Careful: do_each_thread/while_each_thread is a double loop so
         *          'break' will not work as expected - use goto instead.
         */

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Jens Axboe <axboe@suse.de>
18 years agoMerge trivial low-risk suspend hotkey bugzilla-5918 into release
Len Brown [Mon, 21 Aug 2006 01:49:29 +0000 (21:49 -0400)]
Merge trivial low-risk suspend hotkey bugzilla-5918 into release

18 years ago[PATCH] WAN: fix C101 card carrier handling
Krzysztof Halasa [Tue, 15 Aug 2006 23:52:23 +0000 (01:52 +0200)]
[PATCH] WAN: fix C101 card carrier handling

Hi,

One of my recent changes broke C101 carrier handling, this patch
fixes it. Also fixes an old TX underrun checking bug.

2.6.18 material. Please apply.
Thanks.

Signed-off-by: Krzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] ppc32: board-specific part of fs_enet update
Vitaly Bordug [Tue, 15 Aug 2006 06:00:31 +0000 (23:00 -0700)]
[PATCH] ppc32: board-specific part of fs_enet update

This contains board-specific portion to respect driver changes (for 8272ads ,
885ads and 866ads).  Altered platform_data structures as well as initial setup
routines relevant to fs_enet.

Changes to the mpc8560ads ppc/ code are also introduced, but mainly as
reference, since the entire board support is going to appear in arch/powerpc.

Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] FS_ENET: use PAL for mii management
Vitaly Bordug [Tue, 15 Aug 2006 06:00:30 +0000 (23:00 -0700)]
[PATCH] FS_ENET: use PAL for mii management

This patch should update the fs_enet infrastructure to utilize Phy Abstraction
Layer subsystem.  Along with the above, there are apparent bugfixes, overhaul
and improvements.

Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] PAL: Support of the fixed PHY
Vitaly Bordug [Tue, 15 Aug 2006 06:00:29 +0000 (23:00 -0700)]
[PATCH] PAL: Support of the fixed PHY

This makes it possible for HW PHY-less boards to utilize PAL goodies.  Generic
routines to connect to fixed PHY are provided, as well as ability to specify
software callback that fills up link, speed, etc.  information into PHY
descriptor (the latter feature not tested so far).

Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] xircom_cb: wire up errors from pci_register_driver()
Alexey Dobriyan [Tue, 15 Aug 2006 06:00:28 +0000 (23:00 -0700)]
[PATCH] xircom_cb: wire up errors from pci_register_driver()

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Valerie Henson <val_henson@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] s390: fix arp_tbl lock usage in qeth
Heiko Carstens [Tue, 15 Aug 2006 06:00:27 +0000 (23:00 -0700)]
[PATCH] s390: fix arp_tbl lock usage in qeth

qeth: bhs must be disabled when accessing neighbour tables.

=================================
[ INFO: inconsistent lock state ]

Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] skge: remember to run netif_poll_disable()
Edgar E. Iglesias [Tue, 15 Aug 2006 06:00:24 +0000 (23:00 -0700)]
[PATCH] skge: remember to run netif_poll_disable()

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@axis.com>
Cc: Stephen Hemminger <shemminger@osdl.org>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] Add ethtool -g support to Spidernet network driver
Jim Lewis [Tue, 15 Aug 2006 06:00:23 +0000 (23:00 -0700)]
[PATCH] Add ethtool -g support to Spidernet network driver

Add ethtool -g (show ring sizes) support to the Spidernet network driver.

Signed-off-by: James K Lewis <jklewis@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] build fixes: smc91x
David Brownell [Tue, 15 Aug 2006 06:00:22 +0000 (23:00 -0700)]
[PATCH] build fixes: smc91x

Unclear how these bugs arrived, presumably from incorrect cleanup of
the 16-bit-only paths, but smc91x wouldn't build for OMAP.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Cc: Nicolas Pitre <nico@cam.org>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] via-rhine: add option avoid_D3 (work around broken BIOSes)
Roger Luethi [Tue, 15 Aug 2006 06:00:21 +0000 (23:00 -0700)]
[PATCH] via-rhine: add option avoid_D3 (work around broken BIOSes)

It looks like broken BIOSes controlling Rhine chips will remain in use in
significant numbers; such systems fail to come up via PXE after they have
been put into D3 (power-saving) mode.

This patch adds a module option for disabling the call that puts the chip
to sleep.

Signed-off-by: Roger Luethi <rl@hellgate.ch>
Cc: Jeff Garzik <jgarzik@pobox.com>
Cc: Joerg Bashir <brak@archive.org>
Cc: Tim Phipps <tim@phipps-hutton.freeserve.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] lockdep: fix smc91x
Russell King [Tue, 15 Aug 2006 06:00:20 +0000 (23:00 -0700)]
[PATCH] lockdep: fix smc91x

When booting using root-nfs, I'm seeing (independently) two lockdep dumps
in the smc91x driver.  The patch below fixes both.  Both dumps look like
real locking issues.

Nico - please review and ack if you think the patch is correct.

Dump 1:

Sending DHCP requests .
=================================
[ INFO: inconsistent lock state ]

Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] via-rhine: NAPI poll enable
Stephen Hemminger [Tue, 15 Aug 2006 06:00:18 +0000 (23:00 -0700)]
[PATCH] via-rhine: NAPI poll enable

The poll_enable should be in init_registers before enabling interrupts, not
in tx_timeout.  Thanks for spotting it Roger.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Cc: Roger Luethi <rl@hellgate.ch>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] via-rhine: NAPI support
Roger Luethi [Tue, 15 Aug 2006 06:00:17 +0000 (23:00 -0700)]
[PATCH] via-rhine: NAPI support

Add NAPI support to the via-rhine driver so that it can handle higher
speeds and doesn't get overloaded by interrupts as easily.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Roger Luethi <rl@hellgate.ch>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] smc911x: Re-release spinlock on spurious interrupt
Peter Korsgaard [Tue, 15 Aug 2006 06:00:17 +0000 (23:00 -0700)]
[PATCH] smc911x: Re-release spinlock on spurious interrupt

The smc911x driver forgets to release the spinlock on spurious interrupts.
This little patch fixes it.

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] net: Add netconsole support to dm9000 driver
Kevin Hao [Tue, 15 Aug 2006 06:00:15 +0000 (23:00 -0700)]
[PATCH] net: Add netconsole support to dm9000 driver

Add netconsole support to dm9000 driver.

Cc: Jeff Garzik <jeff@garzik.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] s2io build fix
Andrew Morton [Tue, 15 Aug 2006 06:00:14 +0000 (23:00 -0700)]
[PATCH] s2io build fix

sparc32:

drivers/net/s2io.c:2636: warning: implicit declaration of function 'disable_irq'
drivers/net/s2io.c:2656: warning: implicit declaration of function 'enable_irq'

Cc: Ananda Raju <Ananda.Raju@neterion.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] Update smc91x driver with ARM Versatile board info
Deepak Saxena [Tue, 15 Aug 2006 06:00:13 +0000 (23:00 -0700)]
[PATCH] Update smc91x driver with ARM Versatile board info

We need to specify a Versatile-specific SMC_IRQ_FLAGS value or the new
generic IRQ layer will complain thusly:

No IRQF_TRIGGER set_type function for IRQ 25 (<NULL>)

Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Nicolas Pitre <nico@cam.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] Freescale QE UCC gigabit ethernet driver
Li Yang [Tue, 15 Aug 2006 06:00:11 +0000 (23:00 -0700)]
[PATCH] Freescale QE UCC gigabit ethernet driver

QE(QUICC Engine) is a new generation communication coprocessor, which can
be found on some of the latest Freescale PowerQUICC CPUs(e.g.  MPC8360).
The UCC(Unified Communications Controller) module of QE can work as gigabit
Ethernet device.  This patch provides driver for the device.

Signed-off-by: Shlomi Gridish <gridish@freescale.com>
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] drivers/net/e1000/: possible cleanups
Adrian Bunk [Tue, 15 Aug 2006 06:00:10 +0000 (23:00 -0700)]
[PATCH] drivers/net/e1000/: possible cleanups

- make needlessly global functions static
- #if 0 the following unused global functions:
  - e1000_hw.c: e1000_mc_addr_list_update()
  - e1000_hw.c: e1000_read_reg_io()
  - e1000_hw.c: e1000_enable_pciex_master()
  - e1000_hw.c: e1000_ife_disable_dynamic_power_down()
  - e1000_hw.c: e1000_ife_enable_dynamic_power_down()
  - e1000_hw.c: e1000_write_ich8_word()
  - e1000_hw.c: e1000_duplex_reversal()
  - e1000_main.c: e1000_io_read()

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: John Ronciak <john.ronciak@intel.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] sundance section fix
Andrew Morton [Tue, 15 Aug 2006 06:00:10 +0000 (23:00 -0700)]
[PATCH] sundance section fix

drivers/net/sundance.c:110: error: version causes a section type conflict

I don't understand this error.  It's referred to from both __init and
__devinit code.  With CONFIG_HOTPLUG=n, version[] is placed in .init.data and
is referred to from .init.text.

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] fealnx section fix
Andrew Morton [Tue, 15 Aug 2006 06:00:09 +0000 (23:00 -0700)]
[PATCH] fealnx section fix

With CONFIG_HOTPLUG=n it won't compile:

distcc[25607] ERROR: compile drivers/net/fealnx.c on g5/64 failed

version[] is referred to from both __init code and from __devinit code, so
move it out of __init altogether.

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] winbond-840 section fix
Andrew Morton [Tue, 15 Aug 2006 06:00:08 +0000 (23:00 -0700)]
[PATCH] winbond-840 section fix

With CONFIG_HOTPLUG=n it won't compile:

drivers/net/tulip/winbond-840.c:141: error: version causes a section type conflict

(For some reason it gets the same error if marked __initdata.  Give up.)

Cc: Valerie Henson <val_henson@linux.intel.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] seeq8005 section fix
Andrew Morton [Tue, 15 Aug 2006 06:00:08 +0000 (23:00 -0700)]
[PATCH] seeq8005 section fix

WARNING: drivers/net/seeq8005.o - Section mismatch: reference to .init.text:seeq8005_probe from .text between 'init_module' (at offset 0x106) and 'seeq8005_open'

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] ni65 section fix
Andrew Morton [Tue, 15 Aug 2006 06:00:07 +0000 (23:00 -0700)]
[PATCH] ni65 section fix

WARNING: drivers/net/ni65.o - Section mismatch: reference to .init.text:ni65_probe from .text between 'init_module' (at offset 0x54a) and 'ni65_stop_start'

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] wd section fix
Andrew Morton [Tue, 15 Aug 2006 06:00:06 +0000 (23:00 -0700)]
[PATCH] wd section fix

WARNING: drivers/net/wd.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0xfd) and 'wd_open'
WARNING: drivers/net/wd.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x14b) and 'wd_open'
WARNING: drivers/net/wd.o - Section mismatch: reference to .init.data:wd_portlist from .text between 'init_module' (at offset 0x17f) and 'wd_open'

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] smctr section fix
Andrew Morton [Tue, 15 Aug 2006 06:00:06 +0000 (23:00 -0700)]
[PATCH] smctr section fix

WARNING: drivers/net/tokenring/smctr.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x2ba0) and 'smctr_reset_adapter'
WARNING: drivers/net/tokenring/smctr.o - Section mismatch: reference to .init.text:smctr_probe from .text between 'init_module' (at offset 0x2bf4) and 'smctr_reset_adapter'

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] ibmtr section fix
Andrew Morton [Tue, 15 Aug 2006 06:00:05 +0000 (23:00 -0700)]
[PATCH] ibmtr section fix

WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_mem_base from .text between 'ibmtr_probe1' (at offset 0x6e6) and 'ibmtr_probe_card'
WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_mem_base from .text between 'ibmtr_probe1' (at offset 0x74a) and 'ibmtr_probe_card'
WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_mem_base from .text between 'ibmtr_probe1' (at offset 0x7fd) and 'ibmtr_probe_card'

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] ni52 section fix
Andrew Morton [Tue, 15 Aug 2006 06:00:05 +0000 (23:00 -0700)]
[PATCH] ni52 section fix

WARNING: drivers/net/ni52.o - Section mismatch: reference to .init.text:ni52_probe from .text between 'init_module' (at offset 0x997) and 'ni52_close'
WARNING: drivers/net/ni65.o - Section mismatch: reference to .init.text:ni65_probe from .text between 'init_module' (at offset 0x54a) and 'ni65_stop_start'

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] lne390 section fix
Andrew Morton [Tue, 15 Aug 2006 06:00:04 +0000 (23:00 -0700)]
[PATCH] lne390 section fix

WARNING: drivers/net/lne390.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x100) and 'lne390_close'

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] lance section fix
Andrew Morton [Tue, 15 Aug 2006 06:00:03 +0000 (23:00 -0700)]
[PATCH] lance section fix

WARNING: drivers/net/lance.o - Section mismatch: reference to .init.data:lance_portlist from .text between 'init_module' (at offset 0x8d3) and 'lance_purge_ring'
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] eth16i section fix
Andrew Morton [Tue, 15 Aug 2006 06:00:03 +0000 (23:00 -0700)]
[PATCH] eth16i section fix

WARNING: drivers/net/eth16i.o - Section mismatch: reference to .init.data:cardname from .text between 'init_module' (at offset 0x6d2) and 'eth16i_multicast'
WARNING: drivers/net/eth16i.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x6ef) and 'eth16i_multicast'
WARNING: drivers/net/eth16i.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x702) and 'eth16i_multicast'
WARNING: drivers/net/eth16i.o - Section mismatch: reference to .init.data:cardname from .text between 'init_module' (at offset 0x70e) and 'eth16i_multicast'
WARNING: drivers/net/eth16i.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x71d) and 'eth16i_multicast'
WARNING: drivers/net/eth16i.o - Section mismatch: reference to .init.data:cardname from .text between 'init_module' (at offset 0x729) and 'eth16i_multicast'

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] es3210 section fix
Andrew Morton [Tue, 15 Aug 2006 06:00:02 +0000 (23:00 -0700)]
[PATCH] es3210 section fix

WARNING: drivers/net/es3210.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0xdf) and 'es_close'
WARNING: drivers/net/es3210.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x100) and 'es_close'

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] eexpress section fix
Andrew Morton [Tue, 15 Aug 2006 06:00:01 +0000 (23:00 -0700)]
[PATCH] eexpress section fix

WARNING: drivers/net/eexpress.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x6c3) and 'eexp_hw_lasttxstat'
WARNING: drivers/net/eexpress.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x74f) and 'eexp_hw_lasttxstat'

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] eepro section fix
Andrew Morton [Tue, 15 Aug 2006 06:00:01 +0000 (23:00 -0700)]
[PATCH] eepro section fix

WARNING: drivers/net/eepro.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x284) and 'eepro_ethtool_get_drvinfo'
WARNING: drivers/net/eepro.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x2a7) and 'eepro_ethtool_get_drvinfo'
WARNING: drivers/net/eepro.o - Section mismatch: reference to .init.data:eepro_portlist from .text between 'init_module' (at offset 0x2b3) and 'eepro_ethtool_get_drvinfo'

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] e2100 section fix
Andrew Morton [Tue, 15 Aug 2006 06:00:00 +0000 (23:00 -0700)]
[PATCH] e2100 section fix

WARNING: drivers/net/e2100.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0xd9) and 'e21_reset_8390'

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] at1700 section fix
Andrew Morton [Tue, 15 Aug 2006 05:59:59 +0000 (22:59 -0700)]
[PATCH] at1700 section fix

WARNING: drivers/net/at1700.o - Section mismatch: reference to .init.text:at1700_probe from .text between 'init_module' (at offset 0x75) and 'net_get_stats'

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] cs89x0 section fix
Andrew Morton [Tue, 15 Aug 2006 05:59:59 +0000 (22:59 -0700)]
[PATCH] cs89x0 section fix

WARNING: drivers/net/cs89x0.o - Section mismatch: reference to .init.data:version from .text between 'init_module' (at offset 0x13d8) and 'net_get_stats'
WARNING: drivers/net/cs89x0.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x1634) and 'net_get_stats'
WARNING: drivers/net/cs89x0.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x1a1f) and 'net_get_stats'

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] cops section fix
Andrew Morton [Tue, 15 Aug 2006 05:59:58 +0000 (22:59 -0700)]
[PATCH] cops section fix

WARNING: drivers/net/appletalk/cops.o - Section mismatch: reference to .init.text:cops_probe from .text between 'init_module' (at offset 0xae) and 'cops_rx'

Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] ac3200 section fixes
Andrew Morton [Tue, 15 Aug 2006 05:59:57 +0000 (22:59 -0700)]
[PATCH] ac3200 section fixes

WARNING: drivers/net/ac3200.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0xf9) and 'ac_close_card'

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] 82596 section fixes
Andrew Morton [Tue, 15 Aug 2006 05:59:57 +0000 (22:59 -0700)]
[PATCH] 82596 section fixes

WARNING: drivers/net/82596.o - Section mismatch: reference to .init.text:i82596_probe from .text between 'init_module' (at offset 0x141) and 'i596_add_cmd'

Also nail a couple of crazy inlines.

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years agoMerge branch 'master' into upstream-fixes
Jeff Garzik [Sat, 19 Aug 2006 21:27:12 +0000 (17:27 -0400)]
Merge branch 'master' into upstream-fixes

18 years agoMerge branch 'master' into upstream-fixes
Jeff Garzik [Sat, 19 Aug 2006 21:25:34 +0000 (17:25 -0400)]
Merge branch 'master' into upstream-fixes

18 years agoMerge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Greg Kroah-Hartman [Fri, 18 Aug 2006 18:02:52 +0000 (11:02 -0700)]
Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

18 years agoIB/mthca: No userspace SRQs if HCA doesn't have SRQ support
Roland Dreier [Fri, 18 Aug 2006 17:41:46 +0000 (10:41 -0700)]
IB/mthca: No userspace SRQs if HCA doesn't have SRQ support

Leave all SRQ methods out of the device's uverbs_cmd_mask if the
device doesn't have SRQ support (because of ancient firmware) so that
we don't allow userspace to call the driver's create_srq method.  This
fixes a userspace-triggerable oops caused by ib_uverbs_create_srq()
following the device's ->create_srq function pointer, which will be
NULL if the device doesn't support SRQs.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
18 years agoACPI: relax BAD_MADT_ENTRY check to allow LSAPIC variable length string UIDs
Starikovskiy, Alexey Y [Fri, 18 Aug 2006 15:23:00 +0000 (11:23 -0400)]
ACPI: relax BAD_MADT_ENTRY check to allow LSAPIC variable length string UIDs

ACPI 3.0 appended a variable length UID string to the LAPIC structure
as part of support for > 256 processors.  So the BAD_MADT_ENTRY() sanity
check can no longer compare for equality with a fixed structure length.

Signed-off-by: Alexey Y Starikovskiy <alexey.y.starikovskiy@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
18 years ago[ARM] 3746/2: Userspace helpers must be Thumb mode interworkable
Nicolas Pitre [Fri, 18 Aug 2006 16:20:15 +0000 (17:20 +0100)]
[ARM] 3746/2: Userspace helpers must be Thumb mode interworkable

Patch from Nicolas Pitre

The userspace helpers in clean/arch/arm/kernel/entry-armv.S are called
directly in/from userspace. They need to cope with being called from
Thumb code.

Patch below uses the bx interworking instruction when
CONFIG_ARM_THUMB=y.

Based on an earlier patch from Paul Brook <paul@codesourcery.com>

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years agoMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
Greg Kroah-Hartman [Fri, 18 Aug 2006 16:20:04 +0000 (09:20 -0700)]
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

18 years ago[ARM] 3757/1: Use PROCINFO_INITFUNC in head.S
Catalin Marinas [Fri, 18 Aug 2006 14:34:46 +0000 (15:34 +0100)]
[ARM] 3757/1: Use PROCINFO_INITFUNC in head.S

Patch from Catalin Marinas

This is instead of a magic number.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] 3756/1: Assign value for HWCAP_IWMMXT
Paul Gortmaker [Fri, 18 Aug 2006 14:32:17 +0000 (15:32 +0100)]
[ARM] 3756/1: Assign value for HWCAP_IWMMXT

Patch from Paul Gortmaker

Some folks here at Wind River asked me if I'd push this out
so that the value was generally agreed upon in advance by
all folks interested in working with iWMMXt.  Seems simple
enough...

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>