linux-2.6
19 years ago[PATCH] arm/versatile iomem annotations
Al Viro [Wed, 28 Sep 2005 23:09:02 +0000 (00:09 +0100)] 
[PATCH] arm/versatile iomem annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] cyblafb: portability fixes, sanitized work with pointers
Al Viro [Wed, 28 Sep 2005 23:07:29 +0000 (00:07 +0100)] 
[PATCH] cyblafb: portability fixes, sanitized work with pointers

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Knut Petersen <Knut_Petersen@t-online.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] n_r3964: drop bogus fmt casts
Alexey Dobriyan [Wed, 28 Sep 2005 23:05:58 +0000 (00:05 +0100)] 
[PATCH] n_r3964: drop bogus fmt casts

 - print pointers with %p
 - casting pointer structure field to int and printing it with %d...

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] proc_mkdir() should be used to create procfs directories
Al Viro [Wed, 28 Sep 2005 21:32:57 +0000 (22:32 +0100)] 
[PATCH] proc_mkdir() should be used to create procfs directories

A bunch of create_proc_dir_entry() calls creating directories had crept
in since the last sweep; converted to proc_mkdir().

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] uml makefiles sanitized
Al Viro [Wed, 28 Sep 2005 21:27:23 +0000 (22:27 +0100)] 
[PATCH] uml makefiles sanitized

UML makefiles sanitized:
 - number of generated headers reduced to 2 (from user-offsets.c and
   kernel-offsets.c resp.).  The rest is made constant and simply
   includes those two.
 - mk_... helpers are gone now that we don't need to generate these
   headers
 - arch/um/include2 removed since everything under arch/um/include/sysdep
   is constant now and symlink can point straight to source tree.
 - dependencies seriously simplified.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] pcmcia: only start up nonstatic sockets if both mem and io are available
Dominik Brodowski [Wed, 28 Sep 2005 17:29:59 +0000 (19:29 +0200)] 
[PATCH] pcmcia: only start up nonstatic sockets if both mem and io are available

Only start up nonstatic sockets if both IO and MEM resources are available.
Thanks to Russell King and Matthew Wilcox for tracking this down.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
19 years ago[PATCH] pcmcia: allow one port excludes
Dominik Brodowski [Wed, 28 Sep 2005 17:28:37 +0000 (19:28 +0200)] 
[PATCH] pcmcia: allow one port excludes

Allow for excluding only one port in /etc/pcmcia/config.otps

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
19 years ago[PATCH] Keys: Add possessor permissions to keys [try #3]
David Howells [Wed, 28 Sep 2005 16:03:15 +0000 (17:03 +0100)] 
[PATCH] Keys: Add possessor permissions to keys [try #3]

The attached patch adds extra permission grants to keys for the possessor of a
key in addition to the owner, group and other permissions bits. This makes
SUID binaries easier to support without going as far as labelling keys and key
targets using the LSM facilities.

This patch adds a second "pointer type" to key structures (struct key_ref *)
that can have the bottom bit of the address set to indicate the possession of
a key. This is propagated through searches from the keyring to the discovered
key. It has been made a separate type so that the compiler can spot attempts
to dereference a potentially incorrect pointer.

The "possession" attribute can't be attached to a key structure directly as
it's not an intrinsic property of a key.

Pointers to keys have been replaced with struct key_ref *'s wherever
possession information needs to be passed through.

This does assume that the bottom bit of the pointer will always be zero on
return from kmem_cache_alloc().

The key reference type has been made into a typedef so that at least it can be
located in the sources, even though it's basically a pointer to an undefined
type. I've also renamed the accessor functions to be more useful, and all
reference variables should now end in "_ref".

Signed-Off-By: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] cpuset read past eof memory leak fix
Paul Jackson [Wed, 28 Sep 2005 13:42:24 +0000 (06:42 -0700)] 
[PATCH] cpuset read past eof memory leak fix

Don't leak a page of memory if user reads a cpuset file past eof.

Signed-off-by: KUROSAWA Takahiro <kurosawa@valinux.co.jp>
Signed-off-by: Paul Jackson <pj@sgi.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoMerge branch 'for-linus' from master.kernel.org:/pub/scm/linux/kernel/git/roland...
Linus Torvalds [Wed, 28 Sep 2005 14:47:55 +0000 (07:47 -0700)] 
Merge branch 'for-linus' from /linux/kernel/git/roland/infiniband

19 years ago[PATCH] kmalloc_node IRQ safety fix
Alok N Kataria [Wed, 28 Sep 2005 04:45:46 +0000 (21:45 -0700)] 
[PATCH] kmalloc_node IRQ safety fix

In kmalloc_node we are checking if the allocation is for the same node when
interrupts are "on".  This may lead to an allocation on another node than
intended.

This patch just shifts the check for the current node in __cache_alloc_node
when interrupts are disabled.

Signed-off-by: Alok N Kataria <alokk@calsoftinc.com>
Acked-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] ppc64: More hugepage fixes
Benjamin Herrenschmidt [Wed, 28 Sep 2005 04:45:45 +0000 (21:45 -0700)] 
[PATCH] ppc64: More hugepage fixes

My previous patch fixing invalidation of huge PTEs wasn't good enough, we
still had an issue if a PTE invalidation batch contained both small and
large pages.  This patch fixes this by making sure the batch is flushed if
the page size fed to it changes.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] device-mapper: Fix queue_if_no_path initialisation
Alasdair G Kergon [Wed, 28 Sep 2005 04:45:45 +0000 (21:45 -0700)] 
[PATCH] device-mapper: Fix queue_if_no_path initialisation

When creating a multipath device, if the queue_if_no_path parameter is
specified it gets ignored.

While the queue_if_no_path variable is correctly set to 1, the
saved_queue_if_no_path gets set to 0.  When the device is subsequently made
live (resumed), the saved value (0) always overwrites the live value (1) so
the option *always* gets turned off.

The fix adds a parameter to the queue_if_no_path() function to indicate
whether the previous value should be preserved or not - if not, as when the
device is being set up, the saved value is set to the new value (1).

Signed-Off-By: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] device-mapper: Trigger an event when a table is deleted
goggin, edward [Wed, 28 Sep 2005 04:45:44 +0000 (21:45 -0700)] 
[PATCH] device-mapper: Trigger an event when a table is deleted

If anything is waiting on a device's table when the device is removed, we
must first wake it up so it will release its reference.  Otherwise the
table's reference count will not drop to zero and the table will not get
removed.

Signed-Off-By: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] swsusp: avoid problems if there are too many pages to save
Rafael J. Wysocki [Wed, 28 Sep 2005 04:45:43 +0000 (21:45 -0700)] 
[PATCH] swsusp: avoid problems if there are too many pages to save

The following patch makes swsusp avoid problems during resume if there are
too many pages to save on suspend.  It adds a constant that allows us to
verify if we are going to save too many pages and implements the check
(this is done as early as we can tell that the check will trigger, which is
in swsusp_alloc()).

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] orinoco: Fix flood of kernel log with stupid WE warnings
Benjamin Herrenschmidt [Wed, 28 Sep 2005 04:45:41 +0000 (21:45 -0700)] 
[PATCH] orinoco: Fix flood of kernel log with stupid WE warnings

Latest wireless extensions moved a field from netdev -> wireless_handlers.
The WE core will now printk a warning on every call to get_wireless_stats()
on a driver that still uses the old field.  This patch fixes orinoco.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] ppc64: Add missing barrier() in kexec code
Anton Blanchard [Wed, 28 Sep 2005 04:45:38 +0000 (21:45 -0700)] 
[PATCH] ppc64: Add missing barrier() in kexec code

Mikey and I were testing kexec and hit a lockup.  It turns out gcc 4.0
optimises the kexec_prepare_cpus loop so we avoid reloading paca.hw_cpu_id.
 A gcc barrier() fixes the problem.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] cpuset maintainers
Paul Jackson [Wed, 28 Sep 2005 04:45:37 +0000 (21:45 -0700)] 
[PATCH] cpuset maintainers

Specify the cpuset maintainers.

Signed-off-by: Paul Jackson <pj@sgi.com>
Signed-off-by: Simon Derr <simon.derr@bull.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] x86-64: Fix bad assumption that dualcore cpus have synced TSCs
john stultz [Wed, 28 Sep 2005 04:45:36 +0000 (21:45 -0700)] 
[PATCH] x86-64: Fix bad assumption that dualcore cpus have synced TSCs

This should resolve the issue seen in bugme bug #5105, where it is assumed
that dualcore x86_64 systems have synced TSCs.  This is not the case, and
alternate timesources should be used instead.

For more details, see:
http://bugzilla.kernel.org/show_bug.cgi?id=5105

Andi's earlier concerns that the TSCs should be synced on dualcore systems
have been resolved by confirmation from AMD folks that they can be
unsynced.

Acked-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Add IPMI poweroff control to sysfs
Corey Minyard [Wed, 28 Sep 2005 04:45:35 +0000 (21:45 -0700)] 
[PATCH] Add IPMI poweroff control to sysfs

Put the IPMI poweroff_powercycle parameter into sysfs.  This field is
dynamically settable and is valuable to have in sysfs.

Signed-off-by: Corey Minyard <minyard@acm.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] ppc: fix stupid thinko in oprofile fix
Benjamin Herrenschmidt [Wed, 28 Sep 2005 04:45:35 +0000 (21:45 -0700)] 
[PATCH] ppc: fix stupid thinko in oprofile fix

I did something stupid in my oprofile fix, here's the obvious fix:

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Ignore trailing whitespace on kernel parameters correctly
Rusty Russell [Wed, 28 Sep 2005 04:45:34 +0000 (21:45 -0700)] 
[PATCH] Ignore trailing whitespace on kernel parameters correctly

Dave Jones says:

... if the modprobe.conf has trailing whitespace, modules fail to load
with the following helpful message..

snd_intel8x0: Unknown parameter `'

Previous version truncated last argument.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: Dave Jones <davej@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] epoll: handle timeout overflow
Davide Libenzi [Wed, 28 Sep 2005 04:45:33 +0000 (21:45 -0700)] 
[PATCH] epoll: handle timeout overflow

Handle the timeout upper boundary for epoll.

Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] swsusp: prevent possible memory leak
Rafael J. Wysocki [Wed, 28 Sep 2005 04:45:32 +0000 (21:45 -0700)] 
[PATCH] swsusp: prevent possible memory leak

Prevent swsusp from leaking some memory in case of an error in
read_pagedir().  It also prevents the BUG_ON() from triggering if there's
an error while reading swap.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] swsusp: remove wrong code from data_free
Rafael J. Wysocki [Wed, 28 Sep 2005 04:45:31 +0000 (21:45 -0700)] 
[PATCH] swsusp: remove wrong code from data_free

The following patch removes some wrong code from the data_free() function
in swsusp.

This function could only be called if there's an error while writing the
suspend image to swap, so it is not triggered easily.  However, if
triggered, it would probably corrupt some memory.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] pktcdvd: MAINTAINERS record
Peter Osterlund [Wed, 28 Sep 2005 04:45:30 +0000 (21:45 -0700)] 
[PATCH] pktcdvd: MAINTAINERS record

Add a MAINTAINERS entry for the pktcdvd driver.

Signed-off-by: Peter Osterlund <petero2@telia.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] dvb: fix NULL pointer dereference when loading the budget-av module
Jon Burgess [Wed, 28 Sep 2005 04:45:26 +0000 (21:45 -0700)] 
[PATCH] dvb: fix NULL pointer dereference when loading the budget-av module

Ralph Metzler wrote:
> AFAIR, there is a bug in tda10021.c in tda10021_readreg() which
> references state->frontend.dvb->num
> This is fatal if the frontend is not at the probed address and thus
> not yet registered (no dvb entry set yet -> NULL pointer ...).

The attached patch should get rid of the oops.

Signed-off-by: Jon Burgess <jburgess@uklinux.net>
Cc: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] v9fs: fix races in fid allocation
Latchesar Ionkov [Wed, 28 Sep 2005 04:45:24 +0000 (21:45 -0700)] 
[PATCH] v9fs: fix races in fid allocation

Fid management cleanup.  The patch attempts to fix the races in dentry's
fid management.

Dentries don't keep the opened fids anymore, they are moved to the file
structs.  Ideally there should be no more than one fid with fidcreate equal
to zero in the dentry's list of fids.

v9fs_fid_create initializes the important fields (fid, fidcreated) before
v9fs_fid is added to the list.  v9fs_fid_lookup returns only fids that are
not created by v9fs_create.  v9fs_fid_get_created returns the fid created
by the same process by v9fs_create (if any) and removes it from dentry's
list

Signed-off-by: Latchesar Ionkov <lucho@ionkov.net>
Cc: Eric Van Hensbergen <ericvh@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Fix ext3_new_inode() failure paths
Chris Sykes [Wed, 28 Sep 2005 04:45:23 +0000 (21:45 -0700)] 
[PATCH] Fix ext3_new_inode() failure paths

Fix failure paths in ext3_new_inode() and clean up duplicated code: -
DQUOT_DROP() was not being called if ext3_init_security() failed.

Signed-off-by: Chris Sykes <chris@sigsegv.plus.com>
Cc: Stephen Smalley <sds@epoch.ncsc.mil>
Cc: Jan Kara <jack@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Fix ext2_new_inode() failure paths
Chris Sykes [Wed, 28 Sep 2005 04:45:22 +0000 (21:45 -0700)] 
[PATCH] Fix ext2_new_inode() failure paths

Fix failure paths in ext2_new_inode() and clean up duplicated code: -
DQUOT_DROP() was not being called if ext2_init_security() failed.

Signed-off-by: Chris Sykes <chris@sigsegv.plus.com>
Cc: Stephen Smalley <sds@epoch.ncsc.mil>
Cc: Jan Kara <jack@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] fuse: check reserved node ID values
Miklos Szeredi [Wed, 28 Sep 2005 04:45:21 +0000 (21:45 -0700)] 
[PATCH] fuse: check reserved node ID values

This patch checks reserved node ID values returned by lookup and creation
operations.  In case one of the reserved values is sent, return -EIO.

Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] fuse: add required version info
Miklos Szeredi [Wed, 28 Sep 2005 04:45:20 +0000 (21:45 -0700)] 
[PATCH] fuse: add required version info

Add information about required version of the userspace library/utilities
to Documentation/Changes.  Also add pointer to this and to FUSE
documentation from Kconfig.

Thanks to Anton Altaparmakov for the reminder.

Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] mm: move_pte to remap ZERO_PAGE
Nick Piggin [Wed, 28 Sep 2005 04:45:18 +0000 (21:45 -0700)] 
[PATCH] mm: move_pte to remap ZERO_PAGE

Move the ZERO_PAGE remapping complexity to the move_pte macro in
asm-generic, have it conditionally depend on
__HAVE_ARCH_MULTIPLE_ZERO_PAGE, which gets defined for MIPS.

For architectures without __HAVE_ARCH_MULTIPLE_ZERO_PAGE, move_pte becomes
a noop.

From: Hugh Dickins <hugh@veritas.com>

Fix nasty little bug we've missed in Nick's mremap move ZERO_PAGE patch.
The "pte" at that point may be a swap entry or a pte_file entry: we must
check pte_present before perhaps corrupting such an entry.

Patch below against 2.6.14-rc2-mm1, but the same bug is in 2.6.14-rc2's
mm/mremap.c, and more dangerous there since it's affecting all arches: I
think the safest course is to send Nick's patch and Yoichi's build fix and
this fix (build tested) on to Linus - so only MIPS can be affected.

Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[IB] mthca: fix hw_ver value returned from mthca_query_device
Jack Morgenstein [Tue, 27 Sep 2005 20:54:44 +0000 (13:54 -0700)] 
[IB] mthca: fix hw_ver value returned from mthca_query_device

The IB spec defines the field to be 32 bits, not 16 bits.

Signed-off-by: Jack Morgenstein <jackm@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
19 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Tue, 27 Sep 2005 20:33:25 +0000 (13:33 -0700)] 
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

19 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Tue, 27 Sep 2005 20:32:33 +0000 (13:32 -0700)] 
Merge /pub/scm/linux/kernel/git/davem/net-2.6

19 years ago[PATCH] Make POSIX message queue sys_mq_open() honor umask
Krzysztof Benedyczak [Tue, 27 Sep 2005 20:21:36 +0000 (22:21 +0200)] 
[PATCH] Make POSIX message queue sys_mq_open() honor umask

We ignored umask when creating new queues via mq_open (when creating
with open() on mqueue fs it is ok of course).  According to the
specification this a bug.  This trivial patch fixes this.

Signed-off-by: Krzysztof Benedyczak <golbi@mat.uni.torun.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[TG3]: Update driver version and release date.
David S. Miller [Tue, 27 Sep 2005 19:13:38 +0000 (12:13 -0700)] 
[TG3]: Update driver version and release date.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[TG3]: misc. fixes
Michael Chan [Tue, 27 Sep 2005 19:13:10 +0000 (12:13 -0700)] 
[TG3]: misc. fixes

Fix interrupt test handler by adding check for IRQ assertion in
PCI_STATE register in addition to the status block updated bit.

Add test for valid ethernet address in tg3_set_mac_addr().

Add tg3_bus_string() to setup the PCI bus speed/width string for all
PCI/PCIX/PCI Express devices. This is used to print the bus type
during init_one().

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[TG3]: 5780 PHY fixes
Michael Chan [Tue, 27 Sep 2005 19:12:42 +0000 (12:12 -0700)] 
[TG3]: 5780 PHY fixes

Fix 5780 PHY related problems:

1. MAC_RX_MODE reset must be done before setting up the MAC_MODE
   register on 5705_PLUS chips or the chip will stop receiving after
   a while. The MAC_RX_MODE reset is needed to prevent intermittently
   losing the first receive packet on serdes chips.

2. Skip MAC loopback test on 5780 because of hardware errata. Normal
   traffic including PHY loopback is not affected by the errata.

3. PHY loopback fails intermittently on 5708S and this is fixed by
   putting the PHY in loopback mode first before programming the MAC
   mode register. A MAC_RX_MODE reset is also added.

4. Return -EINVAL in tg3_nway_reset() if device is in TBI mode. Allow
   nway_reset if 5780S is in parallel detect mode.

5. Add missing PHY IDs in KNOWN_PHY_ID() macro.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[NEIGH]: Add debugging check when adding timers.
David S. Miller [Tue, 27 Sep 2005 19:07:44 +0000 (12:07 -0700)] 
[NEIGH]: Add debugging check when adding timers.

If we double-add a neighbour entry timer, which should be
impossible but has been reported, dump the current state of
the entry so that we can debug this.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[IB] mthca: Round up number of slots in HCA context memory table
Michael S. Tsirkin [Tue, 27 Sep 2005 04:12:26 +0000 (21:12 -0700)] 
[IB] mthca: Round up number of slots in HCA context memory table

When allocating a table for mem-free HCA context, don't assume that
obj_size * nobj is an even multiple of MTHCA_TABLE_CHUNK_SIZE.  In
particular, make sure we allocate at least one slot even if the table
is smaller than MTHCA_TABLE_CHUNK_SIZE.

Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
19 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Tue, 27 Sep 2005 01:33:26 +0000 (18:33 -0700)] 
Merge /pub/scm/linux/kernel/git/davem/net-2.6

19 years agoMerge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Tue, 27 Sep 2005 01:32:48 +0000 (18:32 -0700)] 
Merge master.kernel.org:/home/rmk/linux-2.6-arm

19 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
Linus Torvalds [Tue, 27 Sep 2005 01:31:36 +0000 (18:31 -0700)] 
Merge /linux/kernel/git/brodo/pcmcia-fixes-2.6

19 years ago[PATCH] missing dependency on arm O= builds
Al Viro [Mon, 26 Sep 2005 06:49:27 +0000 (07:49 +0100)] 
[PATCH] missing dependency on arm O= builds

arm maketools needs include/asm-arm in place in the build tree.
On normal builds it's always there, of course, but on O= it's created
(by generic code) too late - when we get to asm-offset.h.

We used to get away with that by accident - creation of
include/asm-arm/arch symlink creates include/asm-arm and it happened
to go before maketools.  However, we did not have such dependency,
so that luck didn't last - now maketools is picked first and we are screwed.

Both the symlink and maketools are prerequisites of the same
target (archprepare).  This fix is obvious - make the latter explicitly
depend on the former and be done with that.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] m32r: more basic __user annotations
Al Viro [Mon, 26 Sep 2005 05:19:28 +0000 (06:19 +0100)] 
[PATCH] m32r: more basic __user annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] m32r: set CHECKFLAGS properly
Al Viro [Mon, 26 Sep 2005 05:19:28 +0000 (06:19 +0100)] 
[PATCH] m32r: set CHECKFLAGS properly

We do _not_ need "sparse" in sparse arguments ;-)

What we do need is __BIG_ENDIAN__; right now unconditional, when m32r
starts using CPU_LITTLE_ENDIAN, we'll need to adjust.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] m32r: missing __iomem in ioremap() declaration
Al Viro [Mon, 26 Sep 2005 05:19:28 +0000 (06:19 +0100)] 
[PATCH] m32r: missing __iomem in ioremap() declaration

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] useless includes of linux/irq.h in arch/i386
Al Viro [Mon, 26 Sep 2005 04:49:44 +0000 (05:49 +0100)] 
[PATCH] useless includes of linux/irq.h in arch/i386

Most of these guys are simply not needed (pulled by other stuff
via asm-i386/hardirq.h).  One that is not entirely useless is hilarious -
arch/i386/oprofile/nmi_timer_int.c includes linux/irq.h... as a way to
get linux/errno.h

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] missing asm/irq.h (cs89x0)
Al Viro [Mon, 26 Sep 2005 04:25:59 +0000 (05:25 +0100)] 
[PATCH] missing asm/irq.h (cs89x0)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[SPARC64]: Do not do TLB pre-filling any more.
David S. Miller [Mon, 26 Sep 2005 23:12:18 +0000 (16:12 -0700)] 
[SPARC64]: Do not do TLB pre-filling any more.

In order to do it correctly on UltraSPARC-III+ and later we'd
need to add some complicated code to set the TAG access extension
register before loading the TLB.

Since this optimization gives questionable gains, it's best to
just remove it for now instead of adding the fix for Ultra-III+

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[SPARC64]: Simplify Spitfire D-cache page flush.
David S. Miller [Mon, 26 Sep 2005 23:06:03 +0000 (16:06 -0700)] 
[SPARC64]: Simplify Spitfire D-cache page flush.

It tries to batch up the tag loads and comparisons, and
then the stores.  And this is just complicated instead
of efficient.

Also, make the symbol of the Cheetah version more grepable.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/acme/llc-2.6
David S. Miller [Mon, 26 Sep 2005 22:29:31 +0000 (15:29 -0700)] 
Merge /pub/scm/linux/kernel/git/acme/llc-2.6

19 years ago[NETFILTER]: Fix invalid module autoloading by splitting iptable_nat
Harald Welte [Mon, 26 Sep 2005 22:25:11 +0000 (15:25 -0700)] 
[NETFILTER]: Fix invalid module autoloading by splitting iptable_nat

When you've enabled conntrack and NAT as a module (standard case in all
distributions), and you've also enabled the new conntrack netlink
interface, loading ip_conntrack_netlink.ko will auto-load iptable_nat.ko.
This causes a huge performance penalty, since for every packet you iterate
the nat code, even if you don't want it.

This patch splits iptable_nat.ko into the NAT core (ip_nat.ko) and the
iptables frontend (iptable_nat.ko).  Threfore, ip_conntrack_netlink.ko will
only pull ip_nat.ko, but not the frontend.  ip_nat.ko will "only" allocate
some resources, but not affect runtime performance.

This separation is also a nice step in anticipation of new packet filters
(nf-hipac, ipset, pkttables) being able to use the NAT core.

Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[AF_PACKET]: Remove bogus checks added to packet_sendmsg().
David S. Miller [Mon, 26 Sep 2005 22:23:58 +0000 (15:23 -0700)] 
[AF_PACKET]: Remove bogus checks added to packet_sendmsg().

These broke existing apps, and the checks are superfluous
as the values being verified aren't even used.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[IPV6]: Fix [Bug 5306] Oops on IPv6 route lookup
Herbert Xu [Mon, 26 Sep 2005 22:10:16 +0000 (15:10 -0700)] 
[IPV6]: Fix [Bug 5306] Oops on IPv6 route lookup

> Steps to reproduce:
> 1. Boot Linux, do NOT setup any IPv6 routes
> 2. ip route get 2001::1 (or any unroutable address)

Well caught.  We never set rt6i_idev on ip6_null_entry.
This patch should make the problem go away.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[CONNECTOR]: async connector mode.
Evgeniy Polyakov [Mon, 26 Sep 2005 22:06:50 +0000 (15:06 -0700)] 
[CONNECTOR]: async connector mode.

If input message rate from userspace is too high, do not drop them,
but try to deliver using work queue allocation.

Failing there is some kind of congestion control.

It also removes warn_on on this condition, which scares people.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[NET]: Make sure ctl buffer is aligned properly in sys_sendmsg().
Alex Williamson [Mon, 26 Sep 2005 21:28:02 +0000 (14:28 -0700)] 
[NET]: Make sure ctl buffer is aligned properly in sys_sendmsg().

It's on the stack and declared as "unsigned char[]", but pointers
and similar can be in here thus we need to give it an explicit
alignment attribute.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[IB] uverbs: Close some exploitable races
Roland Dreier [Mon, 26 Sep 2005 20:01:03 +0000 (13:01 -0700)] 
[IB] uverbs: Close some exploitable races

Al Viro pointed out that the current IB userspace verbs interface
allows userspace to cause mischief by closing file descriptors before
we're ready, or issuing the same command twice at the same time.  This
patch closes those races, and fixes other obvious problems such as a
module reference leak.

Some other interface bogosities will require an ABI change to fix
properly, so I'm deferring those fixes until 2.6.15.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
19 years ago[ARM] 2936/1: ixp4xx default config fixes
Vincent Sanders [Mon, 26 Sep 2005 18:52:57 +0000 (19:52 +0100)] 
[ARM] 2936/1: ixp4xx default config fixes

Patch from Vincent Sanders

A recent patch which made IXP4xx mach_desc's depend on config options
had the effect of not building the kernel for several machines it
possibly could be, this patch updates the default config to ensure all
possible machines are built for by default.

Signed-off-by: Vincent Sanders <vince@arm.linux.org.uk>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[ARM] 2935/1: ixp4xx: fix warnings in ixp4xx_set_irq_type
David Vrabel [Mon, 26 Sep 2005 18:52:56 +0000 (19:52 +0100)] 
[ARM] 2935/1: ixp4xx: fix warnings in ixp4xx_set_irq_type

Patch from David Vrabel

Signed-off-by: David Vrabel <dvrabel@arcom.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[IB] mthca: Fix off by one bug in mthca_map_cmd
Michael S. Tsirkin [Mon, 26 Sep 2005 16:42:09 +0000 (09:42 -0700)] 
[IB] mthca: Fix off by one bug in mthca_map_cmd

The loop in mthca_map_cmd() would fill one entry past the end of the
mailbox buffer before calling the firmware command.

Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
19 years ago[IB] mthca: fix off by one in clr_int calculation
Michael S. Tsirkin [Mon, 26 Sep 2005 16:29:33 +0000 (09:29 -0700)] 
[IB] mthca: fix off by one in clr_int calculation

We should use the first word of the clear interrupt register if
the bit we're after is < 32, not < 31.

Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
19 years ago[IB] mthca: Fix doorbell record resource leak
Roland Dreier [Thu, 22 Sep 2005 04:40:12 +0000 (21:40 -0700)] 
[IB] mthca: Fix doorbell record resource leak

If we allocate a bunch of doorbell records and then free them, we'll
end up with completely empty pages, which we then free.  However, when
we come back to allocate more doorbell pages, we have to reallocate
those empty pages rather than always trying to take a slot that we've
never used.  If we don't, we eventually use up every slot and fail to
allocate a doorbell record, even though we have plenty of free space.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
19 years agoNTFS: Re-fix sparse warnings in a more correct way, i.e. don't use an enum with
Anton Altaparmakov [Mon, 26 Sep 2005 16:02:41 +0000 (17:02 +0100)] 
NTFS: Re-fix sparse warnings in a more correct way, i.e. don't use an enum with
      different types in it but #define the two constants instead.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
19 years ago[ARM] Remove SA_IRQNOMASK
Russell King [Mon, 26 Sep 2005 14:30:20 +0000 (15:30 +0100)] 
[ARM] Remove SA_IRQNOMASK

SA_IRQNOMASK is unused, remove it.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[PATCH] pcmcia: fix cross-platform issues with pcmcia module aliases
Kars de Jong [Sun, 25 Sep 2005 12:39:46 +0000 (14:39 +0200)] 
[PATCH] pcmcia: fix cross-platform issues with pcmcia module aliases

- Added a missing TO_NATIVE call to scripts/mod/file2alias.c:do_pcmcia_entry()
- Add an alignment attribute to struct pcmcia_device_no to solve an alignment
  issue seen when cross-compiling on x86 for m68k.

Signed-off-by: Kars de Jong <jongk@linux-m68k.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
19 years ago[PATCH] pcmcia: update ID for NinjaATA
Dominik Brodowski [Sat, 17 Sep 2005 09:17:56 +0000 (11:17 +0200)] 
[PATCH] pcmcia: update ID for NinjaATA

Christian Zoz reported there are multiple NinjaATA devices all sharing the
second product ID string, but not the first one.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
19 years ago[PATCH] yenta: more ENE bridges
Daniel Ritz [Sun, 25 Sep 2005 06:12:46 +0000 (23:12 -0700)] 
[PATCH] yenta: more ENE bridges

Adds better support for the CB-710, CB-712, CB-720 and CB-722 bridges from EnE

Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
19 years ago[PATCH] pcmcia: new IDs for serial_cs
Dominik Brodowski [Sun, 25 Sep 2005 06:12:44 +0000 (23:12 -0700)] 
[PATCH] pcmcia: new IDs for serial_cs

Add new ID to serial_cs.c; the CIS fimware override is available by the
manufacturer at http://www.sierrawireless.com .  Remember to name the CIS
binary SW_7xx_SER.cis and to put it into /lib/firmware/

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
19 years ago[PATCH] yenta: add support for more TI bridges
Daniel Ritz [Tue, 20 Sep 2005 21:12:17 +0000 (14:12 -0700)] 
[PATCH] yenta: add support for more TI bridges

Support some more TI cardbus bridges.  most of them are multifunction
devices which adds 1394 controllers, smartcard readers etc.  this could
also help with the various problems with the XX21 controllers seen on the
linux-pcmcia list.

Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
19 years ago[PATCH] pcmcia: fix Kconfig dependency
Komuro [Sun, 25 Sep 2005 06:12:40 +0000 (23:12 -0700)] 
[PATCH] pcmcia: fix Kconfig dependency

TCIC depends on ISA.  It is used with ISA-bus system only.

Signed-off-by: komurojun-mbn@nifty.com
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
19 years ago[PATCH] yenta: tiny cleanup
Dominik Brodowski [Wed, 7 Sep 2005 23:00:28 +0000 (16:00 -0700)] 
[PATCH] yenta: tiny cleanup

pci_set_power_state is not needed, as we call pci_enable_device() somewhere
else.  Also, the resource we write to PCI_BASE_ADDRESS_0 needs to be converted
to bus-centric view first.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
19 years ago[PATCH] yenta: don't mess with bridge control register
Daniel Ritz [Wed, 24 Aug 2005 15:03:23 +0000 (17:03 +0200)] 
[PATCH] yenta: don't mess with bridge control register

In interrupt probing (both ISA and PCI) the bridge control register is used
to change interrupt routing to ISA or PCI by changing bit 7.  But this bit
only controls the routing of card functional interrupts, not the CSC
interrupts which are used for interrupt probing.

A bad side effect of messing with this register in yenta_probe_irq() is
that it can lead to irq storms if a card is inserted and already powered by
the BIOS.

Usage in yenta_sock_init() and yenta_config_init() seem to be fishy as well.

Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
19 years ago[PATCH] yenta: auto-tune EnE bridges for CardBus cards
Daniel Ritz [Mon, 22 Aug 2005 05:29:26 +0000 (22:29 -0700)] 
[PATCH] yenta: auto-tune EnE bridges for CardBus cards

Echo Audio cardbus products are known to be incompatible with EnE bridges.
in order to maybe solve the problem a EnE specific test bit has to be set,
another cleared...but other setups have a good chance to break when just
forcing the bits.  so do the whole thingy automatically.

The patch adds a hook in cb_alloc() that allows special tuning for the
different chipsets.  for ene just match the Echo products and set/clear the
test bits, defaults to do the same thing as w/o the patch to not break
working setups.

Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Cc: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
19 years agoMerge branch 'master' of /home/src/linux-2.6/
Anton Altaparmakov [Mon, 26 Sep 2005 09:50:29 +0000 (10:50 +0100)] 
Merge branch 'master' of /home/src/linux-2.6/

19 years agoNTFS: More $LogFile handling fixes: when chkdsk has been run, it can leave the
Anton Altaparmakov [Mon, 26 Sep 2005 09:48:54 +0000 (10:48 +0100)] 
NTFS: More $LogFile handling fixes: when chkdsk has been run, it can leave the
      restart pages in the journal without multi sector transfer protection
      fixups (i.e. the update sequence array is empty and in fact does not
      exist).

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
19 years agoNTFS: Fix the definition of the CHKD ntfs record magic. It had an off by
Anton Altaparmakov [Mon, 26 Sep 2005 09:45:46 +0000 (10:45 +0100)] 
NTFS: Fix the definition of the CHKD ntfs record magic.  It had an off by
      two error causing it to be CHKB instead of CHKD.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
19 years ago[SPARC64]: Probe D/I/E-cache config and use.
David S. Miller [Mon, 26 Sep 2005 07:32:17 +0000 (00:32 -0700)] 
[SPARC64]: Probe D/I/E-cache config and use.

At boot time, determine the D-cache, I-cache and E-cache size and
line-size.  Use them in cache flushes when appropriate.

This change was motivated by discovering that the D-cache on
UltraSparc-IIIi and later are 64K not 32K, and the flushes done by the
Cheetah error handlers were assuming a 32K size.

There are still some pieces of code that are hard coding things and
will need to be fixed up at some point.

While we're here, fix the D-cache and I-cache parity error handlers
to run with interrupts disabled, and when the trap occurs at trap
level > 1 log the event via a counter displayed in /proc/cpuinfo.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[SPARC64]: Add CONFIG_DEBUG_PAGEALLOC support.
David S. Miller [Sun, 25 Sep 2005 23:46:57 +0000 (16:46 -0700)] 
[SPARC64]: Add CONFIG_DEBUG_PAGEALLOC support.

The trick is that we do the kernel linear mapping TLB miss starting
with an instruction sequence like this:

ba,pt %xcc, kvmap_load
 xor %g2, %g4, %g5

succeeded by an instruction sequence which performs a full page table
walk starting at swapper_pg_dir.

We first take over the trap table from the firmware.  Then, using this
constant PTE generation for the linear mapping area above, we build
the kernel page tables for the linear mapping.

After this is setup, we patch that branch above into a "nop", which
will cause TLB misses to fall through to the full page table walk.

With this, the page unmapping for CONFIG_DEBUG_PAGEALLOC is trivial.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[ARM] 2934/1: Anubis - fix VA offsets for CPLD registers
Ben Dooks [Sun, 25 Sep 2005 22:04:48 +0000 (23:04 +0100)] 
[ARM] 2934/1: Anubis - fix VA offsets for CPLD registers

Patch from Ben Dooks

The VA addresses of the Anubis CPLD registers
confoict with the addresses for the ISA space
maps used by the rest of the s3c2410 architecture

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[SPARC64]: Fix mask formation in tomatillo_wsync_handler()
David S. Miller [Sun, 25 Sep 2005 06:06:14 +0000 (23:06 -0700)] 
[SPARC64]: Fix mask formation in tomatillo_wsync_handler()

"1" needs to be "1UL", this is a 64-bit mask we're creating.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[NETFILTER] ip_conntrack: Update event cache when status changes
Harald Welte [Sat, 24 Sep 2005 23:56:08 +0000 (16:56 -0700)] 
[NETFILTER] ip_conntrack: Update event cache when status changes

The GRE, SCTP and TCP protocol helpers did not call
ip_conntrack_event_cache() when updating ct->status.  This patch adds
the respective calls.

Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[IRDA]: *irttp cleanup
Alexey Dobriyan [Sat, 24 Sep 2005 23:55:17 +0000 (16:55 -0700)] 
[IRDA]: *irttp cleanup

* Remove useless comment.
* Remove useless assertions.
* Remove useless comparison.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[IRDA]: Fix memory leak in irttp_init()
Alexey Dobriyan [Sat, 24 Sep 2005 23:54:50 +0000 (16:54 -0700)] 
[IRDA]: Fix memory leak in irttp_init()

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[NET]: Protect neigh_stat_seq_fops by CONFIG_PROC_FS
Amos Waterland [Sat, 24 Sep 2005 23:53:16 +0000 (16:53 -0700)] 
[NET]: Protect neigh_stat_seq_fops by CONFIG_PROC_FS

From: Amos Waterland <apw@us.ibm.com>

If CONFIG_PROC_FS is not selected, the compiler emits this warning:

 net/core/neighbour.c:64: warning: `neigh_stat_seq_fops' defined but not used

Which is correct, because neigh_stat_seq_fops is in fact only
initialized and used by code that is protected by CONFIG_PROC_FS.  So
this patch fixes that up.

Signed-off-by: Amos Waterland <apw@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[NETFILTER]: Fix ip[6]t_NFQUEUE Kconfig dependency
Harald Welte [Sat, 24 Sep 2005 23:52:03 +0000 (16:52 -0700)] 
[NETFILTER]: Fix ip[6]t_NFQUEUE Kconfig dependency

We have to introduce a separate Kconfig menu entry for the NFQUEUE targets.
They cannot "just" depend on nfnetlink_queue, since nfnetlink_queue could
be linked into the kernel, whereas iptables can be a module.

Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years agoMerge master.kernel.org:/home/rmk/linux-2.6-ucb
Linus Torvalds [Sat, 24 Sep 2005 20:50:35 +0000 (13:50 -0700)] 
Merge master.kernel.org:/home/rmk/linux-2.6-ucb

19 years agoMerge master.kernel.org:/home/rmk/linux-2.6-serial
Linus Torvalds [Sat, 24 Sep 2005 20:49:37 +0000 (13:49 -0700)] 
Merge master.kernel.org:/home/rmk/linux-2.6-serial

19 years agoMerge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Sat, 24 Sep 2005 20:49:01 +0000 (13:49 -0700)] 
Merge master.kernel.org:/home/rmk/linux-2.6-arm

19 years ago[PATCH] Input: check switch bitmap when matching handlers
Dmitry Torokhov [Sat, 24 Sep 2005 07:02:29 +0000 (02:02 -0500)] 
[PATCH] Input: check switch bitmap when matching handlers

The wwitch bitmap was added to input_device_id structure and we should
check it when matching handlers and input devices.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[ARM] Fix compiler warnings for memcpy_toio/memcpy_fromio/memset_io
Russell King [Sat, 24 Sep 2005 09:42:06 +0000 (10:42 +0100)] 
[ARM] Fix compiler warnings for memcpy_toio/memcpy_fromio/memset_io

Add 'volatile' to the __iomem pointers for these functions as
per x86.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[MFD] Fix "bious one-bit signed bitfield" errors
Russell King [Sat, 24 Sep 2005 09:24:37 +0000 (10:24 +0100)] 
[MFD] Fix "bious one-bit signed bitfield" errors

ucb1x00-ts declared a couple of one-bit 'int' bitfields.
Make them unsigned.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[SERIAL] Remove unused variable in clps711x.c
Russell King [Sat, 24 Sep 2005 09:12:47 +0000 (10:12 +0100)] 
[SERIAL] Remove unused variable in clps711x.c

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years agoMerge branch 'upstream' from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Fri, 23 Sep 2005 23:44:52 +0000 (16:44 -0700)] 
Merge branch 'upstream' from /linux/kernel/git/jgarzik/libata-dev

19 years agoMerge branch 'upstream-fixes' from master.kernel.org:/pub/scm/linux/kernel/git/jgarzi...
Linus Torvalds [Fri, 23 Sep 2005 23:44:01 +0000 (16:44 -0700)] 
Merge branch 'upstream-fixes' from /linux/kernel/git/jgarzik/netdev-2.6

19 years ago[PATCH] skge: fix Yukon-Lite A0 workaround
Stephen Hemminger [Fri, 23 Sep 2005 16:08:30 +0000 (09:08 -0700)] 
[PATCH] skge: fix Yukon-Lite A0 workaround

This is one of those workarounds sucked over from sk98lin driver.
The skge driver needs to detect the Yukon-Lite A0 chip properly,
and turn of Rx FIFO Flush.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
19 years agoMerge /spare/repo/linux-2.6/
Jeff Garzik [Fri, 23 Sep 2005 23:03:21 +0000 (19:03 -0400)] 
Merge /spare/repo/linux-2.6/

19 years agoMerge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Fri, 23 Sep 2005 21:01:52 +0000 (14:01 -0700)] 
Merge master.kernel.org:/home/rmk/linux-2.6-arm