sfrench/cifs-2.6.git
14 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
Linus Torvalds [Mon, 13 Nov 2006 16:09:49 +0000 (08:09 -0800)]
Merge /pub/scm/linux/kernel/git/sfrench/cifs-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  [CIFS] Fix minor problem with previous patch
  [CIFS]  Fix mount failure when domain not specified
  [CIFS] Explicitly set stat->blksize
  [CIFS] NFS stress test generates flood of "close with pending write" messages

14 years agoMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Mon, 13 Nov 2006 16:03:32 +0000 (08:03 -0800)]
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  [PATCH] drivers cris: return on NULL dev_alloc_skb()
  [PATCH] com20020 build fix
  [PATCH] bonding: lockdep annotation
  [PATCH] bcm43xx: Add error checking in bcm43xx_sprom_write()
  [PATCH] bcm43xx: Drain TX status before starting IRQs

14 years ago[PATCH] SCSI core: always store >= 36 bytes of INQUIRY data
Alan Stern [Fri, 10 Nov 2006 20:27:57 +0000 (12:27 -0800)]
[PATCH] SCSI core: always store >= 36 bytes of INQUIRY data

This patch (as810c) copies a minimum of 36 bytes of INQUIRY data, even if
the device claims that not all of them are valid.  Often badly behaved
devices put plausible data in the Vendor, Product, and Revision strings but
set the Additional Length byte to a small value.  Using potentially valid
data is certainly better than allocating a short buffer and then reading
beyond the end of it, which is what we do now.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] Fix misrouted interrupts deadlocks
Pavel Emelianov [Fri, 10 Nov 2006 20:27:56 +0000 (12:27 -0800)]
[PATCH] Fix misrouted interrupts deadlocks

While testing kernel on machine with "irqpoll" option I've caught such a
lockup:

__do_IRQ()
   spin_lock(&desc->lock);
           desc->chip->ack(); /* IRQ is ACKed */
note_interrupt()
misrouted_irq()
handle_IRQ_event()
           if (...)
      local_irq_enable_in_hardirq();
/* interrupts are enabled from now */
...
__do_IRQ() /* same IRQ we've started from */
   spin_lock(&desc->lock); /* LOCKUP */

Looking at misrouted_irq() code I've found that a potential deadlock like
this can also take place:

1CPU:
__do_IRQ()
   spin_lock(&desc->lock); /* irq = A */
misrouted_irq()
   for (i = 1; i < NR_IRQS; i++) {
      spin_lock(&desc->lock); /* irq = B */
      if (desc->status & IRQ_INPROGRESS) {

2CPU:
__do_IRQ()
   spin_lock(&desc->lock); /* irq = B */
misrouted_irq()
   for (i = 1; i < NR_IRQS; i++) {
      spin_lock(&desc->lock); /* irq = A */
      if (desc->status & IRQ_INPROGRESS) {

As the second lock on both CPUs is taken before checking that this irq is
being handled in another processor this may cause a deadlock.  This issue
is only theoretical.

I propose the attached patch to fix booth problems: when trying to handle
misrouted IRQ active desc->lock may be unlocked.

Acked-by: Ingo Molnar <mingo@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] fix Data Acess error in dup_fd
Sharyathi Nagesh [Fri, 10 Nov 2006 20:27:54 +0000 (12:27 -0800)]
[PATCH] fix Data Acess error in dup_fd

On running the Stress Test on machine for more than 72 hours following
error message was observed.

0:mon> e
cpu 0x0: Vector: 300 (Data Access) at [c00000007ce2f7f0]
    pc: c000000000060d90: .dup_fd+0x240/0x39c
    lr: c000000000060d6c: .dup_fd+0x21c/0x39c
    sp: c00000007ce2fa70
   msr: 800000000000b032
   dar: ffffffff00000028
 dsisr: 40000000
  current = 0xc000000074950980
  paca    = 0xc000000000454500
    pid   = 27330, comm = bash

0:mon> t
[c00000007ce2fa70c000000000060d28 .dup_fd+0x1d8/0x39c (unreliable)
[c00000007ce2fb30c000000000060f48 .copy_files+0x5c/0x88
[c00000007ce2fbd0c000000000061f5c .copy_process+0x574/0x1520
[c00000007ce2fcd0c000000000062f88 .do_fork+0x80/0x1c4
[c00000007ce2fdc0c000000000011790 .sys_clone+0x5c/0x74
[c00000007ce2fe30c000000000008950 .ppc_clone+0x8/0xc

The problem is because of race window.  When if(expand) block is executed in
dup_fd unlocking of oldf->file_lock give a window for fdtable in oldf to be
modified.  So actual open_files in oldf may not match with open_files
variable.

Cc: Vadim Lobanov <vlobanov@speakeasy.net>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] .gitignore: add miscellaneous files
Franck Bui-Huu [Fri, 10 Nov 2006 20:27:53 +0000 (12:27 -0800)]
[PATCH] .gitignore: add miscellaneous files

Prevent git from reporting this useless status:

On branch refs/heads/master
Untracked files:
  (use "git add" to add to commit)

      TAGS
      scripts/kconfig/lkc_defs.h
      scripts/kconfig/qconf.moc
nothing to commit

Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] Fix missing parens in set_personality()
Russell King [Fri, 10 Nov 2006 20:27:53 +0000 (12:27 -0800)]
[PATCH] Fix missing parens in set_personality()

If you call set_personality() with an expression such as:

set_personality(foo ? PERS_FOO1 : PERS_FOO2);

then this evaluates to:

((current->personality == foo ? PERS_FOO1 : PERS_FOO2) ? ...

which is obviously not the intended result.  Add the missing parents
to ensure this gets evaluated as expected:

((current->personality == (foo ? PERS_FOO1 : PERS_FOO2)) ? ...

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] Patch for nvidia divide by zero error for 7600 pci-express card
Wink Saville [Fri, 10 Nov 2006 20:27:52 +0000 (12:27 -0800)]
[PATCH] Patch for nvidia divide by zero error for 7600 pci-express card

The following patch resolves the divide by zero error I encountered on my
system:

http://marc.10east.com/?l=linux-fbdev-devel&m=116058257024413&w=2

I accomplished this by merging what I thought was appropriate from:

http://webcvs.freedesktop.org/xorg/driver/xf86-video-nv/src/

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] IPMI: Fix more && typos
Corey Minyard [Fri, 10 Nov 2006 20:27:50 +0000 (12:27 -0800)]
[PATCH] IPMI: Fix more && typos

Fix improper use of "&&" when "&" was intended.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Corey Minyard <minyard@acm.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] mspec driver build fix
Jes Sorensen [Fri, 10 Nov 2006 20:27:49 +0000 (12:27 -0800)]
[PATCH] mspec driver build fix

Fix MSPEC driver to build for non SN2 enabled configs as the driver should
work in cached and uncached modes (no fetchop) on these systems.  In
addition make MSPEC select IA64_UNCACHED_ALLOCATOR, which is required for
it and move it to arch/ia64/Kconfig to avoid warnings on non ia64
architectures running allmodconfig.  Once the Kconfig code is fixed, we can
move it back.

Signed-off-by: Jes Sorensen <jes@sgi.com>
Cc: Fernando Luis Vzquez Cao <fernando@oss.ntt.co.jp>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] pci: don't try to remove sysfs files before they are setup.
David Miller [Fri, 10 Nov 2006 20:27:48 +0000 (12:27 -0800)]
[PATCH] pci: don't try to remove sysfs files before they are setup.

The PCI sysfs attributes are created after the initial PCI bus scan.  With
the addition of more return value checking and assertions in the device and
sysfs layers we now can get dumps like this on sparc64:

[   20.135032] Call Trace:
[   20.135042]  [0000000000537f88] pci_remove_bus_device+0x30/0xc0
[   20.135076]  [000000000078f890] pci_fill_in_pbm_cookies+0x98/0x440
[   20.135109]  [000000000042e828] sabre_scan_bus+0x230/0x400
[   20.135139]  [000000000078c710] pcibios_init+0x58/0xa0
[   20.135159]  [0000000000416f14] init+0x9c/0x2e0
[   20.135190]  [0000000000417a50] kernel_thread+0x38/0x60
[   20.135211]  [0000000000417170] rest_init+0x18/0x40
[   20.135514] PCI0(PBMB): Bus running at 33MHz

It's triggering because removal of the "config" PCI sysfs file for the
device fails.

On sparc64, after probing the device, we'll delete the PCI device via
pci_remove_bus_device() if we cannot find the firmware device tree node
corresponding to it.

This is fine, but at this point the sysfs files for the PCI device won't be
setup yet.

So we should not try to do anything in pci_remove_sysfs_dev_files() if
pci_sysfs_init() has not run yet.

Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] vmalloc: optimization, cleanup, bugfixes
Eric Dumazet [Fri, 10 Nov 2006 20:27:48 +0000 (12:27 -0800)]
[PATCH] vmalloc: optimization, cleanup, bugfixes

- reorder 'struct vm_struct' to speedup lookups on CPUS with small cache
  lines.  The fields 'next,addr,size' should be now in the same cache line,
  to speedup lookups.

- One minor cleanup in __get_vm_area_node()

- Bugfixes in vmalloc_user() and vmalloc_32_user() NULL returns from
  __vmalloc() and __find_vm_area() were not tested.

[akpm@osdl.org: remove redundant BUG_ONs]
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years agoMerge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
Jeff Garzik [Fri, 10 Nov 2006 16:10:51 +0000 (11:10 -0500)]
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes

14 years ago[PATCH] drivers cris: return on NULL dev_alloc_skb()
David Rientjes [Thu, 9 Nov 2006 03:49:15 +0000 (19:49 -0800)]
[PATCH] drivers cris: return on NULL dev_alloc_skb()

If the next descriptor array entry cannot be allocated by dev_alloc_skb(),
return immediately so it is not dereferenced later.  We cannot register the
device with a partial descriptor list.

Cc: Mikael Starvik <starvik@axis.com>
Signed-off-by: David Rientjes <rientjes@cs.washington.edu>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
14 years ago[PATCH] com20020 build fix
Randy Dunlap [Thu, 9 Nov 2006 03:51:03 +0000 (19:51 -0800)]
[PATCH] com20020 build fix

com20020.c needs to export functions if either of the ISA or PCI modules
are built as loadable modules.  Or they could always be exported.

WARNING: "com20020_found" [drivers/net/arcnet/com20020-pci.ko] undefined!
WARNING: "com20020_check" [drivers/net/arcnet/com20020-pci.ko] undefined!

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Toralf Forster <toralf.foerster@gmx.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
14 years ago[PATCH] bonding: lockdep annotation
Peter Zijlstra [Thu, 9 Nov 2006 03:51:01 +0000 (19:51 -0800)]
[PATCH] bonding: lockdep annotation

=============================================
[ INFO: possible recursive locking detected ]
2.6.17-1.2600.fc6 #1

Signed-off-by: Jeff Garzik <jeff@garzik.org>
14 years ago[CIFS] Fix minor problem with previous patch
Steve French [Thu, 9 Nov 2006 21:25:37 +0000 (21:25 +0000)]
[CIFS] Fix minor problem with previous patch

The patch
NFS stress test generates flood of "close with pending write

was missing an if

Signed-off-by: Steve French <sfrench@us.ibm.com>
14 years ago[PATCH] nfsd: fix spurious error return from nfsd_create in async case
J. Bruce Fields [Thu, 9 Nov 2006 01:44:59 +0000 (17:44 -0800)]
[PATCH] nfsd: fix spurious error return from nfsd_create in async case

Commit 6264d69d7df654ca64f625e9409189a0e50734e9 modified the nfsd_create()
error handling in such a way that nfsd_create will usually return
nfserr_perm even when succesful, if the export has the async export option.

This introduced a regression that could cause mkdir() to always return a
permissions error, even though the directory in question was actually
succesfully created.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Acked-by: NeilBrown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] IB/ipath - program intconfig register using new HT irq hook
Bryan O'Sullivan [Thu, 9 Nov 2006 01:44:58 +0000 (17:44 -0800)]
[PATCH] IB/ipath - program intconfig register using new HT irq hook

Eric's changes to the htirq infrastructure require corresponding
modifications to the ipath HT driver code so that interrupts are still
delivered properly.

Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Roland Dreier <rdreier@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] htirq: allow buggy drivers of buggy hardware to write the registers
Eric W. Biederman [Thu, 9 Nov 2006 01:44:57 +0000 (17:44 -0800)]
[PATCH] htirq: allow buggy drivers of buggy hardware to write the registers

This patch adds a variant of ht_create_irq __ht_create_irq that takes an
aditional parameter update that is a function that is called whenever we want
to write to a drivers htirq configuration registers.

This is needed to support the ipath_iba6110 because it's registers in the
proper location are not actually conected to the hardware that controlls
interrupt delivery.

[bos@serpentine.com: fixes]
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Cc: Andi Kleen <ak@suse.de>
Cc: <olson@pathscale.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] htirq: refactor so we only have one function that writes to the chip
Eric W. Biederman [Thu, 9 Nov 2006 01:44:57 +0000 (17:44 -0800)]
[PATCH] htirq: refactor so we only have one function that writes to the chip

This refactoring actually optimizes the code a little by caching the value
that we think the device is programmed with instead of reading it back from
the hardware.  Which simplifies the code a little and should speed things up a
bit.

This patch introduces the concept of a ht_irq_msg and modifies the
architecture read/write routines to update this code.

There is a minor consistency fix here as well as x86_64 forgot to initialize
the htirq as masked.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Cc: Andi Kleen <ak@suse.de>
Acked-by: Bryan O'Sullivan <bos@pathscale.com>
Cc: <olson@pathscale.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] ipmi_si_intf.c: fix "&& 0xff" typos
Alexey Dobriyan [Thu, 9 Nov 2006 01:44:56 +0000 (17:44 -0800)]
[PATCH] ipmi_si_intf.c: fix "&& 0xff" typos

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Corey Minyard <minyard@acm.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] IPMI: retry messages on certain error returns
Corey Minyard [Thu, 9 Nov 2006 01:44:55 +0000 (17:44 -0800)]
[PATCH] IPMI: retry messages on certain error returns

Some more errors from the IPMI send message command are retryable, but are not
being retried by the IPMI code.  Make sure they get retried.

Signed-off-by: Corey Minyard <minyard@acm.org>
Cc: Frederic Lelievre <Frederic.Lelievre@ca.kontron.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] IPMI: Clean up the waiting message queue properly on unload
Corey Minyard [Thu, 9 Nov 2006 01:44:52 +0000 (17:44 -0800)]
[PATCH] IPMI: Clean up the waiting message queue properly on unload

A wrong function was being used to free a list; this fixes the problem.
Otherwise, an oops at unload time was possible.  But not likely, since you
can't have any users when you unload the modules and it is very hard to get
messages into this queue without users.

Signed-off-by: Corey Minyard <minyard@acm.org>
Cc: Patrick Schoeller <Patrick.Schoeller@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] sysctl: Undeprecate sys_sysctl
Eric W. Biederman [Thu, 9 Nov 2006 01:44:51 +0000 (17:44 -0800)]
[PATCH] sysctl: Undeprecate sys_sysctl

The basic issue is that despite have been deprecated and warned about as a
very bad thing in the man pages since its inception there are a few real
users of sys_sysctl.  It was my assumption that because sysctl had been
deprecated for all of 2.6 there would be no user space users by this point,
so I initially gave sys_sysctl a very short deprecation period.

Now that I know there are a few real users the only sane way to proceed
with deprecation is to push the time limit out to a year or two work and
work with distributions that have big testing pools like fedora core to
find these last remaining users.

Which means that the sys_sysctl interface needs to be maintained in the
meantime.

Since I have provided a technical measure that allows us to add new sysctl
entries without reserving more binary numbers I believe that is enough to
fix the sys_sysctl binary interface maintenance problems, because there is
no longer a need to change the binary interface at all.

Since the sys_sysctl implementation needs to stay around for a while and
the worst of the maintenance issues that caused us to occasionally break
the ABI have been addressed I don't see any advantage in continuing with
the removal of sys_sysctl.

So instead of merely increasing the deprecation period this patch removes
the deprecation of sys_sysctl and modifies the kernel to compile the code
in by default.

With committing to maintain sys_sysctl we get all of the advantages of a
fast interface for anything that needs it.  Currently sys_sysctl is about
5x faster than /proc/sys, for the same string data.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] ia64: select ACPI_NUMA if ACPI
KAMEZAWA Hiroyuki [Thu, 9 Nov 2006 01:44:50 +0000 (17:44 -0800)]
[PATCH] ia64: select ACPI_NUMA if ACPI

When ACPI && NUMA, pxm_to_node is used and it exists in drivers/acpi/numa.c

Tony said:

  The patch makes sense ...  if you pick both of "ACPI" and "NUMA", then you
  need (and should automatically be given) ACPI_NUMA too.

  The only open question is whether there is a better way of getting there.
  Perhaps with less configuration options in the first place?  We are heading
  towards a future where so many systems will be NUMA that there would seem to
  be little benefit in keeping ACPI_NUMA separate from ACPI ...  but perhaps
  we aren't quite there yet.

Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujtisu.com>
Cc: Len Brown <lenb@kernel.org>
Acked-by: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] kretprobe: fix kretprobe-booster to save regs and set status
Masami Hiramatsu [Thu, 9 Nov 2006 01:44:49 +0000 (17:44 -0800)]
[PATCH] kretprobe: fix kretprobe-booster to save regs and set status

There are two bugs in the kretprobe-booster.

1) It doesn't make room for gs registers.

2) It doesn't change status of the current kprobe.  This status will
   effect the fault handling.

This patch fixes these bugs and, additionally, saves skipped registers for
compatibility with the original kretprobe.

Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] md: do not freeze md threads for suspend
Rafael J. Wysocki [Thu, 9 Nov 2006 01:44:48 +0000 (17:44 -0800)]
[PATCH] md: do not freeze md threads for suspend

If there's a swap file on a software RAID, it should be possible to use this
file for saving the swsusp's suspend image.  Also, this file should be
available to the memory management subsystem when memory is being freed before
the suspend image is created.

For the above reasons it seems that md_threads should not be frozen during the
suspend and the appended patch makes this happen, but then there is the
question if they don't cause any data to be written to disks after the suspend
image has been created, provided that all filesystems are frozen at that time.

Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] md: fix sizing problem with raid5-reshape and CONFIG_LBD=n
NeilBrown [Thu, 9 Nov 2006 01:44:48 +0000 (17:44 -0800)]
[PATCH] md: fix sizing problem with raid5-reshape and CONFIG_LBD=n

I forgot to has the size-in-blocks to (loff_t) before shifting up to a
size-in-bytes.

Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] md: change ONLINE/OFFLINE events to a single CHANGE event
NeilBrown [Thu, 9 Nov 2006 01:44:47 +0000 (17:44 -0800)]
[PATCH] md: change ONLINE/OFFLINE events to a single CHANGE event

It turns out that CHANGE is preferred to ONLINE/OFFLINE for various reasons
(not least of which being that udev understands it already).

So remove the recently added KOBJ_OFFLINE (no-one is likely to care anyway)
and change the ONLINE to a CHANGE event

Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Neil Brown <neilb@suse.de>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] Tigran has moved
Tigran Aivazian [Thu, 9 Nov 2006 01:44:46 +0000 (17:44 -0800)]
[PATCH] Tigran has moved

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] drivers/telephony/ixj: fix an array overrun
Adrian Bunk [Thu, 9 Nov 2006 01:44:45 +0000 (17:44 -0800)]
[PATCH] drivers/telephony/ixj: fix an array overrun

The Coverity checker noted that in
drivers/telephony/ixj.c:ixj_build_filter_cadence(), filter_en[4] or
filter_en[5] could be written to.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] dm: raid1: fix waiting for io on suspend
Jonathan E Brassow [Thu, 9 Nov 2006 01:44:44 +0000 (17:44 -0800)]
[PATCH] dm: raid1: fix waiting for io on suspend

All device-mapper targets must complete outstanding I/O before suspending.
The mirror target generates I/O in its recovery phase and fails to wait for
it.  It needs to be tracked so we can ensure that it has completed before we
suspend.

[akpm@osdl.org: cleanup]
Signed-off-by: Jonathan E Brassow <jbrassow@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Cc: <dm-devel@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] dm: multipath: fix rr_add_path order
Jonathan E Brassow [Thu, 9 Nov 2006 01:44:43 +0000 (17:44 -0800)]
[PATCH] dm: multipath: fix rr_add_path order

When adding paths to the round-robin path selector, their order gets inverted,
which is not desirable.

Fix by replacing list_add() with list_add_tail().

Signed-off-by: Jonathan E Brassow <jbrassow@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Cc: <dm-devel@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] dm: suspend: fix error path
Alasdair G Kergon [Thu, 9 Nov 2006 01:44:43 +0000 (17:44 -0800)]
[PATCH] dm: suspend: fix error path

If the device is already suspended, just return the error and skip the code
that would incorrectly wipe md->suspended_bdev.

(This isn't currently a problem because existing code avoids calling this
function if the device is already suspended.)

Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Cc: <dm-devel@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] dm: fix find_device race
Alasdair G Kergon [Thu, 9 Nov 2006 01:44:42 +0000 (17:44 -0800)]
[PATCH] dm: fix find_device race

There is a race between dev_create() and find_device().

If the mdptr has not yet been stored against a device, find_device() needs to
behave as though no device was found.  It already returns NULL, but there is a
dm_put() missing: it must drop the reference dm_get_md() took.

The bug was introduced by dm-fix-mapped-device-ref-counting.patch.

It manifests itself if another dm ioctl attempts to reference a newly-created
device while the device creation ioctl is still running.  The consequence is
that the device cannot be removed until the machine is rebooted.  Certain udev
configurations can lead to this happening.

Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Cc: <dm-devel@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] i386: Force data segment to be 4K aligned
Vivek Goyal [Thu, 9 Nov 2006 01:44:41 +0000 (17:44 -0800)]
[PATCH] i386: Force data segment to be 4K aligned

o Currently there is no specific alignment restriction in linker script
  and in some cases it can be placed non 4K aligned addresses. This fails
  kexec which checks that segment to be loaded is page aligned.

o I guess, it does not harm data segment to be 4K aligned.

Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] nfsd4: fix open-create permissions
J. Bruce Fields [Thu, 9 Nov 2006 01:44:40 +0000 (17:44 -0800)]
[PATCH] nfsd4: fix open-create permissions

In the case where an open creates the file, we shouldn't be rechecking
permissions to open the file; the open succeeds regardless of what the new
file's mode bits say.

This patch fixes the problem, but only by introducing yet another parameter
to nfsd_create_v3.  This is ugly.  This will be fixed by later patches.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Acked-by: Neil Brown <neilb@suse.de>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] nfsd4: reindent do_open_lookup()
J. Bruce Fields [Thu, 9 Nov 2006 01:44:39 +0000 (17:44 -0800)]
[PATCH] nfsd4: reindent do_open_lookup()

Minor rearrangement, cleanup of do_open_lookup().  No change in behavior.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Acked-by: Neil Brown <neilb@suse.de>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] A minor fix for set_mb() in Documentation/memory-barriers.txt
Oleg Nesterov [Thu, 9 Nov 2006 01:44:38 +0000 (17:44 -0800)]
[PATCH] A minor fix for set_mb() in Documentation/memory-barriers.txt

set_mb() is used by set_current_state() which needs mb(), not wmb().  I
think it would be right to assume that set_mb() implies mb(), all arches
seem to do just this.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] Regression in 2.6.19-rc microcode driver
Arjan van de Ven [Thu, 9 Nov 2006 01:44:37 +0000 (17:44 -0800)]
[PATCH] Regression in 2.6.19-rc microcode driver

If the microcode driver is built in (rather than module) there are some,
ehm, interesting effects happening due to the new "call out to userspace"
behavior that is introduced..  and which runs too early.  The result is a
boot hang; which is really nasty.

The patch below is a minimally safe patch to fix this regression for 2.6.19
by just not requesting actual microcode updates during early boot.  (That
is a good idea in general anyway)

The "real" fix is a lot more complex given the entire cpu hotplug scenario
(during cpu hotplug you normally need to load the microcode as well); but
the interactions for that are just really messy at this point; this fix at
least makes it work and avoids a full detangle of hotplug.

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[CIFS] Fix mount failure when domain not specified
Steve French [Wed, 8 Nov 2006 23:10:46 +0000 (23:10 +0000)]
[CIFS]  Fix mount failure when domain not specified

    Fixes Samba bugzilla #4176

    When users do not specify their domain on mount, 2.6.18 started sending
    default domain instead of a null domain (which was the only way on some
    servers to use a default domain).  Users of 2.6.18 who did not specify
    their domain name on mounts to certain common Windows servers that were
    members of a domain, but not the domain controller, would get mount
    failures which they did not get in 2.6.18

    This fixes that issue and should remove complaints about mount
    behavior changing.

Signed-off-by: Steve French <sfrench@us.ibm.com>
14 years agoMerge merom:v2.6/linux
Linus Torvalds [Wed, 8 Nov 2006 18:45:37 +0000 (10:45 -0800)]
Merge merom:v2.6/linux

* merom:v2.6/linux:
  x86-64: write IO APIC irq routing entries in correct order
  x86-64: clean up io-apic accesses

14 years agox86-64: write IO APIC irq routing entries in correct order
Linus Torvalds [Wed, 8 Nov 2006 18:27:54 +0000 (10:27 -0800)]
x86-64: write IO APIC irq routing entries in correct order

This is the x86-64 version of f9dadfa71bc594df09044da61d1c72701121d802
that did the same thing on i386.

Since the "mask" bit is in the low word, when we write a new entry, we
need to write the high word first, before we potentially unmask it.

The exception is when we actually want to mask the interrupt, in which
case we want to write the low word first to make sure that the high word
doesn't change while the interrupt routing is still active.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years agox86-64: clean up io-apic accesses
Linus Torvalds [Wed, 8 Nov 2006 18:23:03 +0000 (10:23 -0800)]
x86-64: clean up io-apic accesses

This is just commit 130fe05dbc0114609cfef9815c0c5580b42decfa ported to
x86-64, for all the same reasons.  It cleans up the IO-APIC accesses in
order to then fix the ordering issues.

We move the accessor functions (that were only used by io_apic.c) out of
a header file, and use proper memory-mapped accesses rather than making
up our own "volatile" pointers.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years agoRevert "[PATCH] i386: Add MMCFG resources to i386 too"
Linus Torvalds [Wed, 8 Nov 2006 18:09:28 +0000 (10:09 -0800)]
Revert "[PATCH] i386: Add MMCFG resources to i386 too"

This reverts commit de09bddb9d6f96785be470c832b881e6d72d589f.  It tried
to reserve the MMCONFIG mmio memory ranges, but since the MMCONFIG
information is broken and often bogus (which is why we don't dare use it
most of the time _anyway_), it does more harm than good.

Cc: Jeff Chua <jeff.chua.linux@gmail.com>
Cc: Adrian Bunk <bunk@stusta.de>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years agoMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Wed, 8 Nov 2006 16:05:59 +0000 (08:05 -0800)]
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] sata_via: fix obvious typo

14 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Wed, 8 Nov 2006 15:34:11 +0000 (07:34 -0800)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [DECNET]: Endianess fixes (try #2)
  [TG3]: Fix array overrun in tg3_read_partno().
  [NET]: Set truesize in pskb_copy
  [NETPOLL]: Compute checksum properly in netpoll_send_udp().
  [PKT_SCHED] sch_htb: Use hlist_del_init().
  [TCP]: Don't use highmem in tcp hash size calculation.
  [NET]: kconfig, correct traffic shaper

14 years ago[libata] sata_via: fix obvious typo
Jeff Garzik [Wed, 8 Nov 2006 12:46:02 +0000 (07:46 -0500)]
[libata] sata_via: fix obvious typo

Spotted by Martin Devera.

Signed-off-by: Jeff Garzik <jeff@garzik.org>
14 years agoLinux 2.6.19-rc5 v2.6.19-rc5
Linus Torvalds [Wed, 8 Nov 2006 02:24:20 +0000 (18:24 -0800)]
Linux 2.6.19-rc5

Ok, things are clearly starting to calm down.. Finally.

14 years agoMerge branch 'fixes_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbgla...
Linus Torvalds [Wed, 8 Nov 2006 02:22:31 +0000 (18:22 -0800)]
Merge branch 'fixes_for_linus' of git://git./linux/kernel/git/jbglaw/vax-linux

* 'fixes_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbglaw/vax-linux:
  Update for the srm_env driver.

14 years ago[PATCH] bcm43xx: Add error checking in bcm43xx_sprom_write()
Adrian Bunk [Mon, 6 Nov 2006 15:48:48 +0000 (09:48 -0600)]
[PATCH] bcm43xx: Add error checking in bcm43xx_sprom_write()

The Coverity checker noted that these "if (err)"'s couldn't ever be
true.

It seems the intention was to check the return values of the
bcm43xx_pci_write_config32()'s?

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
14 years ago[PATCH] bcm43xx: Drain TX status before starting IRQs
Michael Buesch [Mon, 6 Nov 2006 15:45:31 +0000 (09:45 -0600)]
[PATCH] bcm43xx: Drain TX status before starting IRQs

Drain the Microcode TX-status-FIFO before we enable IRQs.
This is required, because the FIFO may still have entries left
from a previous run. Those would immediately fire after enabling
IRQs and would lead to an oops in the DMA TXstatus handling code.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
14 years ago[DECNET]: Endianess fixes (try #2)
Steven Whitehouse [Tue, 7 Nov 2006 23:09:17 +0000 (15:09 -0800)]
[DECNET]: Endianess fixes (try #2)

Here are some fixes to endianess problems spotted by Al Viro.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[TG3]: Fix array overrun in tg3_read_partno().
Michael Chan [Tue, 7 Nov 2006 22:57:51 +0000 (14:57 -0800)]
[TG3]: Fix array overrun in tg3_read_partno().

Use proper upper limits for the loops and check for all error
conditions.

The problem was noticed by Adrian Bunk.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[NET]: Set truesize in pskb_copy
Herbert Xu [Tue, 7 Nov 2006 22:57:15 +0000 (14:57 -0800)]
[NET]: Set truesize in pskb_copy

Since pskb_copy tacks on the non-linear bits from the original
skb, it needs to count them in the truesize field of the new skb.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[NETPOLL]: Compute checksum properly in netpoll_send_udp().
Chris Lalancette [Tue, 7 Nov 2006 22:56:19 +0000 (14:56 -0800)]
[NETPOLL]: Compute checksum properly in netpoll_send_udp().

Signed-off-by: Chris Lalancette <clalance@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[PKT_SCHED] sch_htb: Use hlist_del_init().
Stephen Hemminger [Tue, 7 Nov 2006 22:54:46 +0000 (14:54 -0800)]
[PKT_SCHED] sch_htb: Use hlist_del_init().

Otherwise we can hit paths that (legally) do multiple deletes on the
same node and OOPS with the HLIST poison values there instead of
NULL.

Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[TCP]: Don't use highmem in tcp hash size calculation.
John Heffner [Tue, 7 Nov 2006 07:10:51 +0000 (23:10 -0800)]
[TCP]: Don't use highmem in tcp hash size calculation.

This patch removes consideration of high memory when determining TCP
hash table sizes.  Taking into account high memory results in tcp_mem
values that are too large.

Signed-off-by: John Heffner <jheffner@psc.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[NET]: kconfig, correct traffic shaper
Jiri Slaby [Mon, 6 Nov 2006 22:34:48 +0000 (14:34 -0800)]
[NET]: kconfig, correct traffic shaper

As Patrick McHardy <kaber@trash.net> suggested, Traffic Shaper is now
obsolete and alternative to it is no longer CBQ, since its problems with
virtual devices, alter Kconfig text to reflect this -- put a link to the
traffic schedulers as a whole.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Acked-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years agoMerge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Tue, 7 Nov 2006 22:55:40 +0000 (14:55 -0800)]
Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3927/1: Allow show_mem() to work with holes in memory map.
  [ARM] 3926/1: make timer led handle HZ != 100
  [ARM] 3923/1: S3C24XX: update s3c2410_defconfig with new drivers
  [ARM] 3922/1: S3C24XX: update s3c2410_defconfig to 2.6.19-rc4
  [ARM] 3921/1: S3C24XX: remove bast_defconfig
  [ARM] 3920/1: S3C24XX: Remove smdk2410_defconfig
  [ARM] 3919/1: Fixed definition of some PXA270 CIF related registers
  [ARM] 3918/1: ixp4xx irq-chip rework
  [ARM] 3912/1: Make PXA270 advertise HWCAP_IWMMXT capability
  [ARM] 3915/1: S3C2412: Add s3c2410_gpio_getirq() to general gpio.c
  [ARM] 3917/1: Fix dmabounce symbol exports

14 years agoUpdate for the srm_env driver.
Jan-Benedict Glaw [Tue, 7 Nov 2006 22:50:37 +0000 (23:50 +0100)]
Update for the srm_env driver.

This patch contains a fix for a bug introduced more than a year ago
(not setting *eof) and updates whitespace a bit.

Signed-off-by: Jan-Benedict Glaw <jbglaw@lug-owl.de>
14 years ago[ARM] 3927/1: Allow show_mem() to work with holes in memory map.
Ray Lehtiniemi [Tue, 7 Nov 2006 02:19:15 +0000 (03:19 +0100)]
[ARM] 3927/1: Allow show_mem() to work with holes in memory map.

show_mem() was not correctly handling holes in the memory
map.  It was treating the freed sections of the map as
though they contained valid struct page entries.  This
could cause incorrect debugging output or even a kernel
panic.

This patch keeps the struct meminfo around after system
initialization so that show_mem() can use it when
scanning memory.  show_mem() now walks over each bank
of each online node, rather than assuming that each node
contains a single contiguous bank.

Signed-off-by: Ray Lehtiniemi <rayl@mail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 3926/1: make timer led handle HZ != 100
David Brownell [Mon, 6 Nov 2006 18:29:16 +0000 (19:29 +0100)]
[ARM] 3926/1: make timer led handle HZ != 100

The timer LED is unusable at HZ=large, since it's got
a hard-wired value of 100 ticks per cycle; when HZ=1024
(for example) it's essentially always-on.  This patch
just makes that be HZ ticks per cycle.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[CIFS] Explicitly set stat->blksize
Steve French [Tue, 7 Nov 2006 19:26:33 +0000 (19:26 +0000)]
[CIFS] Explicitly set stat->blksize

CIFS may perform I/O over the network in larger chunks than the page size,
so it should explicitly set stat->blksize to ensure optimal I/O bandwidth

Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
14 years ago[CIFS] NFS stress test generates flood of "close with pending write" messages
Steve French [Tue, 7 Nov 2006 16:31:16 +0000 (16:31 +0000)]
[CIFS] NFS stress test generates flood of "close with pending write" messages

Informational/debug message was being logged too often. The error
case of logging having to send a close with (presumably stuck on buggy
server) pending writes is still logged.

Signed-off-by: Steve French <sfrench@us.ibm.com>
14 years ago[PATCH] e1000: Fix regression: garbled stats and irq allocation during swsusp
Auke Kok [Mon, 6 Nov 2006 16:57:12 +0000 (08:57 -0800)]
[PATCH] e1000: Fix regression: garbled stats and irq allocation during swsusp

e1000: Fix suspend/resume powerup and irq allocation

From: Auke Kok <auke-jan.h.kok@intel.com>

After 7.0.33/2.6.16, e1000 suspend/resume left the user with an enabled
device showing garbled statistics and undetermined irq allocation state,
where `ifconfig eth0 down` would display `trying to free already freed irq`.

Explicitly free and allocate irq as well as powerup the PHY during resume
fixes when needed.

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
14 years ago[PATCH] b44: change comment about irq mask register
Johannes Berg [Mon, 6 Nov 2006 22:17:20 +0000 (23:17 +0100)]
[PATCH] b44: change comment about irq mask register

Through some experimentation with the similarly built bcm43xx I came to
the conclusion that if the hw/firmware sets a bit in the interrupt
register, an interrupt will only be raised if that bit is included in
the interrupt mask. Hence, the interrupt mask is more like an interrupt
control mask.

This patch changes the comment to reflect that.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
14 years agoMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Linus Torvalds [Tue, 7 Nov 2006 03:53:12 +0000 (19:53 -0800)]
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Fix EV64120 and Ocelot builds by providing a plat_timer_setup().
  [MIPS] EV64120: Fix PCI interrupt allocation.
  [MIPS] Make irq number allocator generally available for fixing EV64120.
  [MIPS] EV64120: Fix timer initialization for HZ != 100.
  [MIPS] Ocelot 3: Fix MAC address detection after platform_device conversion.
  [MIPS] Ocelot C: Fix MAC address detection after platform_device conversion.
  [MIPS] SB1: On bootup only flush cache on local CPU.
  [MIPS] Ocelot 3: Fix large number of warnings.
  [MIPS] Ocelot C: Fix mapping of ioport address range.
  [MIPS] Ocelot C: Fix warning about missmatching format string.
  [MIPS] Ocelot C: fix eth registration after conversion to platform_device
  [MIPS] Ocelot C: Fix large number of warnings.

14 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Linus Torvalds [Tue, 7 Nov 2006 03:52:29 +0000 (19:52 -0800)]
Merge branch 'master' of git://git./linux/kernel/git/mchehab/v4l-dvb

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (4751): Fix DBV_FE_CUSTOMISE for card drivers compiled into kernel
  V4L/DVB (4784): [saa7146_i2c] short_delay mode fixed for fast machines
  V4L/DVB (4770): Fix mode switch of Compro Videomate T300
  V4L/DVB (4787): Budget-ci: Inversion setting fixed for Technotrend 1500 T
  V4L/DVB (4786): Pvrusb2: use NULL instead of 0
  V4L/DVB (4785): Budget-ci: Change DEBIADDR_IR to a safer default
  V4L/DVB (4752): DVB: Add DVB_FE_CUSTOMISE support for MT2060

14 years ago[MIPS] Fix EV64120 and Ocelot builds by providing a plat_timer_setup().
Ralf Baechle [Mon, 6 Nov 2006 18:17:35 +0000 (18:17 +0000)]
[MIPS] Fix EV64120 and Ocelot builds by providing a plat_timer_setup().

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] EV64120: Fix PCI interrupt allocation.
Ralf Baechle [Mon, 6 Nov 2006 18:05:08 +0000 (18:05 +0000)]
[MIPS] EV64120: Fix PCI interrupt allocation.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] Make irq number allocator generally available for fixing EV64120.
Ralf Baechle [Mon, 6 Nov 2006 17:41:06 +0000 (17:41 +0000)]
[MIPS] Make irq number allocator generally available for fixing EV64120.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] EV64120: Fix timer initialization for HZ != 100.
Ralf Baechle [Mon, 6 Nov 2006 13:32:39 +0000 (13:32 +0000)]
[MIPS] EV64120: Fix timer initialization for HZ != 100.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] Ocelot 3: Fix MAC address detection after platform_device conversion.
Ralf Baechle [Sun, 5 Nov 2006 01:18:43 +0000 (01:18 +0000)]
[MIPS] Ocelot 3: Fix MAC address detection after platform_device conversion.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] Ocelot C: Fix MAC address detection after platform_device conversion.
Ralf Baechle [Sun, 5 Nov 2006 01:18:11 +0000 (01:18 +0000)]
[MIPS] Ocelot C: Fix MAC address detection after platform_device conversion.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] SB1: On bootup only flush cache on local CPU.
Ralf Baechle [Sat, 4 Nov 2006 23:26:27 +0000 (23:26 +0000)]
[MIPS] SB1: On bootup only flush cache on local CPU.

This fixes a warning on bootup warning in smp_call_function.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] Ocelot 3: Fix large number of warnings.
Ralf Baechle [Sat, 4 Nov 2006 13:02:46 +0000 (13:02 +0000)]
[MIPS] Ocelot 3: Fix large number of warnings.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] Ocelot C: Fix mapping of ioport address range.
Ralf Baechle [Fri, 3 Nov 2006 18:06:33 +0000 (18:06 +0000)]
[MIPS] Ocelot C: Fix mapping of ioport address range.

 o Fix warnings
 o 768MB worth of I/O ports were insane
 o 64-bit kernels don't need special handling because ioremap does the magic

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] Ocelot C: Fix warning about missmatching format string.
Ralf Baechle [Fri, 3 Nov 2006 17:48:17 +0000 (17:48 +0000)]
[MIPS] Ocelot C: Fix warning about missmatching format string.

  CC      arch/mips/momentum/ocelot_c/setup.o
arch/mips/momentum/ocelot_c/setup.c: In function 'momenco_time_init':
arch/mips/momentum/ocelot_c/setup.c:223: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'

Change data type to match format string; a 32-bit type better suits our
needs.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] Ocelot C: fix eth registration after conversion to platform_device
Ralf Baechle [Fri, 3 Nov 2006 17:45:25 +0000 (17:45 +0000)]
[MIPS] Ocelot C: fix eth registration after conversion to platform_device

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] Ocelot C: Fix large number of warnings.
Ralf Baechle [Fri, 3 Nov 2006 17:42:47 +0000 (17:42 +0000)]
[MIPS] Ocelot C: Fix large number of warnings.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
Linus Torvalds [Mon, 6 Nov 2006 17:10:25 +0000 (09:10 -0800)]
Merge git://git./linux/kernel/git/steve/gfs2-2.6-fixes

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
  [DLM] fix oops in kref_put when removing a lockspace
  [DLM] Fix kref_put oops
  [GFS2] Fix OOM error handling
  [GFS2] Fix incorrect fs sync behaviour.
  [GFS2] don't panic needlessly

14 years agoMerge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32
Linus Torvalds [Mon, 6 Nov 2006 17:07:19 +0000 (09:07 -0800)]
Merge branch 'for-linus' of git://atmel.no/~hskinnemoen/linux/kernel/avr32

* 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32:
  AVR32: Add missing return instruction in __raw_writesb
  AVR32: Wire up sys_epoll_pwait
  AVR32: Fix thinko in generic_find_next_zero_le_bit()
  AVR32: Get rid of board_early_init

14 years agoMerge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
Linus Torvalds [Mon, 6 Nov 2006 17:06:53 +0000 (09:06 -0800)]
Merge branch 'for-linus' of git://git390.osdl.marist.edu/linux-2.6

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] IRQs too early enabled.
  [S390] revert add_active_range() usage patch.

14 years ago[DLM] fix oops in kref_put when removing a lockspace
Patrick Caulfield [Mon, 6 Nov 2006 08:53:28 +0000 (08:53 +0000)]
[DLM] fix oops in kref_put when removing a lockspace

Now that the lockspace struct is freed when the last sysfs object is released
this patch prevents use of that lockspace by sysfs. We attempt to re-get the
lockspace from the lockspace list and fail the request if it has been removed.

Signed-Off-By: Patrick Caulfield <pcaulfie@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
14 years ago[DLM] Fix kref_put oops
Patrick Caulfield [Thu, 2 Nov 2006 14:41:23 +0000 (14:41 +0000)]
[DLM] Fix kref_put oops

This patch fixes the recounting on the lockspace kobject. Previously the lockspace was freed while userspace could have had a
reference to one of its sysfs files, causing an oops in kref_put.

Now the lockspace kfree is moved into the kobject release() function

Signed-Off-By: Patrick Caulfield <pcaulfie@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
14 years ago[GFS2] Fix OOM error handling
Steven Whitehouse [Mon, 30 Oct 2006 21:59:08 +0000 (16:59 -0500)]
[GFS2] Fix OOM error handling

Fix the OOM error handling in inode.c where it was possible for
a NULL pointer to be dereferenced.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
14 years ago[GFS2] Fix incorrect fs sync behaviour.
Steven Whitehouse [Wed, 1 Nov 2006 14:57:57 +0000 (09:57 -0500)]
[GFS2] Fix incorrect fs sync behaviour.

This adds a sync_fs superblock operation for GFS2 and removes
the journal flush from write_super in favour of sync_fs where it
ought to be. This is more or less identical to the way in which ext3
does this.

This bug was pointed out by Russell Cattelan <cattelan@redhat.com>

Cc: Russell Cattelan <cattelan@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
14 years ago[GFS2] don't panic needlessly
Alexey Dobriyan [Fri, 27 Oct 2006 23:03:48 +0000 (03:03 +0400)]
[GFS2] don't panic needlessly

First, SLAB_PANIC is unjustified. Second, all error propagating and backing out
is in place.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
14 years agoAVR32: Add missing return instruction in __raw_writesb
Haavard Skinnemoen [Mon, 6 Nov 2006 13:06:45 +0000 (14:06 +0100)]
AVR32: Add missing return instruction in __raw_writesb

__raw_writesb ends with a conditional branch, which is obviously
wrong. It should return after the last loop terminates.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
14 years agoAVR32: Wire up sys_epoll_pwait
Haavard Skinnemoen [Mon, 6 Nov 2006 13:02:44 +0000 (14:02 +0100)]
AVR32: Wire up sys_epoll_pwait

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
14 years ago[S390] IRQs too early enabled.
Heiko Carstens [Mon, 6 Nov 2006 09:49:02 +0000 (10:49 +0100)]
[S390] IRQs too early enabled.

setup_lowcore() calls ctl_set_bit() which returns withs interrupts
enabled. The setup arch code is not supposed to enable interrupts that
early. Therefore use the __ctl_set_bit() variant.
This fixes the not working lock dependency validator on non 64 bit
systems.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
14 years ago[S390] revert add_active_range() usage patch.
Heiko Carstens [Mon, 6 Nov 2006 09:49:00 +0000 (10:49 +0100)]
[S390] revert add_active_range() usage patch.

Commit 7676bef9c183fd573822cac9992927ef596d584c breaks DCSS support on
s390. DCSS needs initialized struct pages to work. With the usage of
add_active_range() only the struct pages for physically present pages
are initialized.
This could be fixed if the DCSS driver would initiliaze the struct pages
itself, but this doesn't work too. This is because the mem_map array
does not include holes after the last present memory area and therefore
there is nothing that could be initialized.
To fix this and to avoid some dirty hacks revert this patch for now.
Will be added later when we move to a virtual mem_map.

Cc: Carsten Otte <cotte@de.ibm.com>
Cc: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
14 years agoMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Mon, 6 Nov 2006 09:46:43 +0000 (01:46 -0800)]
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  [PATCH] Kconfig: remove redundant NETDEVICES depends
  [PATCH] ehea: 64K page support fix
  [PATCH] ehea: Removed redundant define
  [PATCH] ehea: Nullpointer dereferencation fix
  [PATCH] bcm43xx: fix unexpected LED control values in BCM4303 sprom
  [PATCH] bcm43xx: Fix low-traffic netdev watchdog TX timeouts
  [PATCH] hostap_plx: fix CIS verification
  [PATCH] ieee80211: don't flood log with errors

14 years ago[PATCH] sunrpc: add missing spin_unlock
Akinobu Mita [Mon, 6 Nov 2006 07:52:13 +0000 (23:52 -0800)]
[PATCH] sunrpc: add missing spin_unlock

auth_domain_put() forgot to unlock acquired spinlock.

Cc: Olaf Kirch <okir@monad.swb.de>
Cc: Andy Adamson <andros@citi.umich.edu>
Cc: J. Bruce Fields <bfields@citi.umich.edu>
Acked-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Neil Brown <neilb@suse.de>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] sysctl: implement CTL_UNNUMBERED
Eric W. Biederman [Mon, 6 Nov 2006 07:52:13 +0000 (23:52 -0800)]
[PATCH] sysctl: implement CTL_UNNUMBERED

This patch takes the CTL_UNNUMBERD concept from NFS and makes it available to
all new sysctl users.

At the same time the sysctl binary interface maintenance documentation is
updated to mention and to describe what is needed to successfully maintain the
sysctl binary interface.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] sysctl: allow a zero ctl_name in the middle of a sysctl table
Eric W. Biederman [Mon, 6 Nov 2006 07:52:12 +0000 (23:52 -0800)]
[PATCH] sysctl: allow a zero ctl_name in the middle of a sysctl table

Since it is becoming clear that there are just enough users of the binary
sysctl interface that completely removing the binary interface from the kernel
will not be an option for foreseeable future, we need to find a way to address
the sysctl maintenance issues.

The basic problem is that sysctl requires one central authority to allocate
sysctl numbers, or else conflicts and ABI breakage occur.  The proc interface
to sysctl does not have that problem, as names are not densely allocated.

By not terminating a sysctl table until I have neither a ctl_name nor a
procname, it becomes simple to add sysctl entries that don't show up in the
binary sysctl interface.  Which allows people to avoid allocating a binary
sysctl value when not needed.

I have audited the kernel code and in my reading I have not found a single
sysctl table that wasn't terminated by a completely zero filled entry.  So
this change in behavior should not affect anything.

I think this mechanism eases the pain enough that combined with a little
disciple we can solve the reoccurring sysctl ABI breakage.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] Improve the removed sysctl warnings
Eric W. Biederman [Mon, 6 Nov 2006 07:52:11 +0000 (23:52 -0800)]
[PATCH] Improve the removed sysctl warnings

Don't warn about libpthread's access to kernel.version.  When it receives
-ENOSYS it will read /proc/sys/kernel/version.

If anything else shows up print the sysctl number string.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Cc: Cal Peake <cp@absolutedigital.net>
Cc: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] lockdep: fix delayacct locking bug
Peter Zijlstra [Mon, 6 Nov 2006 07:52:10 +0000 (23:52 -0800)]
[PATCH] lockdep: fix delayacct locking bug

Make the delayacct lock irqsave; this avoids the possible deadlock where
an interrupt is taken while holding the delayacct lock which needs to
take the delayacct lock.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Balbir Singh <balbir@in.ibm.com>
Cc: Shailabh Nagar <nagar@watson.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>