]> err.no Git - linux-2.6/log
linux-2.6
18 years ago[PATCH] alpha pt_regs cleanups: machine_check()
Al Viro [Sun, 8 Oct 2006 13:44:38 +0000 (14:44 +0100)]
[PATCH] alpha pt_regs cleanups: machine_check()

do set_irq_regs() in caller, kill pt_regs argument.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] alpha pt_regs cleanups: handle_irq()
Al Viro [Sun, 8 Oct 2006 13:37:32 +0000 (14:37 +0100)]
[PATCH] alpha pt_regs cleanups: handle_irq()

isa_no_iack_sc_device_interrupt() always gets get_irq_regs() as
argument; kill that argument.

All but two callers of handle_irq() pass get_irq_regs() as argument;
convert the remaining two, kill set_irq_regs() inside handle_irq().

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] alpha pt_regs cleanups: device_interrupt
Al Viro [Sun, 8 Oct 2006 13:36:08 +0000 (14:36 +0100)]
[PATCH] alpha pt_regs cleanups: device_interrupt

callers of ->device_interrupt() do set_irq_regs() now; pt_regs argument
removed, remaining uses of regs in instances of ->device_interrupt()
are switched to get_irq_regs() and will be gone in the next patch.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] m68k pt_regs fixes, part 2
Al Viro [Sun, 8 Oct 2006 13:33:33 +0000 (14:33 +0100)]
[PATCH] m68k pt_regs fixes, part 2

Fallout from previous patch:
 - actually add include/asm-m68k/irq_regs.h
 - missed the prototype of sun3_sched_init()

NB: git diff without argumentgs sucks when you've added
some files...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] sparc32 rwlock fix
Al Viro [Sun, 8 Oct 2006 13:32:15 +0000 (14:32 +0100)]
[PATCH] sparc32 rwlock fix

read_trylock() is broken on sparc32 (doesn't build and didn't work
right, actually).  Proposed fix:

 - make "writer holds lock" distinguishable from "reader tries to grab
   lock"

 - have __raw_read_trylock() try to acquire the mutex (in LSB of lock),
   terminating spin if we see that there's writer holding it.  Then do
   the rest as we do in read_lock().

Thanks to Ingo for discussion...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] sparc64 pt_regs fixes
Al Viro [Sun, 8 Oct 2006 12:23:28 +0000 (08:23 -0400)]
[PATCH] sparc64 pt_regs fixes

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] sparc32 pt_regs fixes
Al Viro [Sun, 8 Oct 2006 13:30:44 +0000 (14:30 +0100)]
[PATCH] sparc32 pt_regs fixes

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years agoMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...
Linus Torvalds [Sun, 8 Oct 2006 19:28:41 +0000 (12:28 -0700)]
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  ieee1394: nodemgr: fix startup of knodemgrd

18 years agoMerge branch 'irq-fixes' of git://git.parisc-linux.org/git/linux-2.6
Linus Torvalds [Sun, 8 Oct 2006 19:26:00 +0000 (12:26 -0700)]
Merge branch 'irq-fixes' of git://git.parisc-linux.org/git/linux-2.6

* 'irq-fixes' of git://git.parisc-linux.org/git/linux-2.6:
  [PARISC] More pt_regs removal
  [PARISC] pdc_init no longer exists
  [PARISC] Make firmware calls irqsafe-ish...
  [PA-RISC] Fix boot breakage
  [PARISC] Use set_irq_regs

18 years ago[PATCH] x86_64 irq: Allocate a vector across all cpus for genapic_flat.
Eric W. Biederman [Sun, 8 Oct 2006 13:47:55 +0000 (07:47 -0600)]
[PATCH] x86_64 irq: Allocate a vector across all cpus for genapic_flat.

The problem we can't take advantage of lowest priority delivery mode if
the vectors are allocated for only one cpu at a time.  Nor can we work
around hardware that assumes lowest priority delivery mode is always
used with several cpus.

So this patch introduces the concept of a vector_allocation_domain.  A
set of cpus that will receive an irq on the same vector.  Currently the
code for implementing this is placed in the genapic structure so we can
vary this depending on how we are using the io_apics.

This allows us to restore the previous behaviour of genapic_flat without
removing the benefits of having separate vector allocation for large
machines.

This should also fix the problem report where a hyperthreaded cpu was
receving the irq on the wrong hyperthread when in logical delivery mode
because the previous behaviour is restored.

This patch properly records our allocation of the first 16 irqs to the
first 16 available vectors on all cpus.  This should be fine but it may
run into problems with multiple interrupts at the same interrupt level.
Except for some badly maintained comments in the code and the behaviour
of the interrupt allocator I have no real understanding of that problem.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] i386/x86_64: Remove global IO_APIC_VECTOR
Eric W. Biederman [Sun, 8 Oct 2006 13:43:46 +0000 (07:43 -0600)]
[PATCH] i386/x86_64: Remove global IO_APIC_VECTOR

Which vector an irq is assigned to now varies dynamically and is
not needed outside of io_apic.c.  So remove the possibility
of accessing the information outside of io_apic.c and remove
the silly macro that makes looking for users of irq_vector
difficult.

The fact this compiles ensures there aren't any more pieces
of the old CONFIG_PCI_MSI weirdness that I failed to remove.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] i386/x86_64: FIX pci_enable_irq to set dev->irq to the irq number
Eric W. Biederman [Sun, 8 Oct 2006 13:41:19 +0000 (07:41 -0600)]
[PATCH] i386/x86_64: FIX pci_enable_irq to set dev->irq to the irq number

In commit ace80ab796ae30d2c9ee8a84ab6f608a61f8b87b I removed the weird
logic that used the vector number as the irq number when MSI was
defined.  However pci_enable_irq was using a different test in the
io_apic_assign_irqs path and I missed it :(

This patch removes the wrong code so no one hits this problem.

This code is only active when a specific set of boot command line
parameters is specified which likely explains why no one has notices
this earlier.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] NFS: Fix typo in nfs_get_client()
Trond Myklebust [Sun, 8 Oct 2006 18:33:24 +0000 (14:33 -0400)]
[PATCH] NFS: Fix typo in nfs_get_client()

NFS_CS_INITING > NFS_CS_READY, so instead of waiting for the structure to
get initialised, we currently immediately jump out of the loop without ever
sleeping.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years agoieee1394: nodemgr: fix startup of knodemgrd
Stefan Richter [Fri, 6 Oct 2006 17:49:52 +0000 (19:49 +0200)]
ieee1394: nodemgr: fix startup of knodemgrd

Revert a thinko in commit d2f119fe319528da8c76a1107459d6f478cbf28c:
When knodemgrd starts, it needs to sleep until host->generation was
incremented above its initial value of 0.  My wrong logic caused it to
start sending requests when the bus wasn't completely ready.  Seen as
"AT dma reset ctx=0, aborting transmission" messages in 2.6.19-rc1.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
18 years ago[MIPS] Fix DECserial build error by IRQ hander change
Yoichi Yuasa [Sat, 7 Oct 2006 04:41:51 +0000 (13:41 +0900)]
[MIPS] Fix DECserial build error by IRQ hander change

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Complete fixes after removal of pt_regs argument to int handlers.
Ralf Baechle [Sat, 7 Oct 2006 18:44:33 +0000 (19:44 +0100)]
[MIPS] Complete fixes after removal of pt_regs argument to int handlers.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Show actual CPU information in /proc/cpuinfo
Karl-Johan Karlsson [Sat, 7 Oct 2006 23:15:02 +0000 (01:15 +0200)]
[MIPS] Show actual CPU information in /proc/cpuinfo

Currently, /proc/cpuinfo contains several copies of the information for
whatever processor we happen to be scheduled on. This patch makes it contain
the proper information for each CPU, which is particularly useful on mixed
R12k/R10k IP27 machines.

Signed-off-by: Karl-Johan Karlsson <creideiki@lysator.liu.se>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Cobalt: Time runs too quickly
Scott Ashcroft [Fri, 6 Oct 2006 15:54:54 +0000 (16:54 +0100)]
[MIPS] Cobalt: Time runs too quickly

A kernel built with HZ==250 runs about 4 four times too quickly on a
Cobalt RaQ2.

Signed-off-by: Scott Ashcroft <scott.ashcroft@talk21.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years ago[MIPS] Update Malta config.
Ralf Baechle [Fri, 6 Oct 2006 16:36:20 +0000 (17:36 +0100)]
[MIPS] Update Malta config.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
18 years agoMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
Linus Torvalds [Sat, 7 Oct 2006 17:52:00 +0000 (10:52 -0700)]
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] PReP fixup after irq changes
  [POWERPC] SPU fixup after irq changes
  [POWERPC] Fix up after irq changes
  [POWERPC] Fix iseries/smp.c for irq breakage
  [POWERPC] Fix viocons for irq breakage
  [POWERPC] Update iseries_defconfig
  [POWERPC] Fix fsl_soc build breaks
  [POWERPC] Minor fix for bootargs property
  [POWERPC] Update MTFSF_L() comment
  [POWERPC] Update pSeries defconfig for SATA
  [POWERPC] Don't get PCI IRQ from OF for devices with no IRQ
  [POWERPC] Fix zImage decompress location
  [POWERPC] linux,tce-size property is 32 bits
  [POWERPC] Add DTS for MPC8349E-mITX board
  [POWERPC] Fix harmless typo
  [PPC] Fix some irq breakage with ARCH=ppc

18 years ago[PATCH] m32r pt_regs fixes
Al Viro [Sat, 7 Oct 2006 15:29:18 +0000 (16:29 +0100)]
[PATCH] m32r pt_regs fixes

... and now with irq_regs.h not forgotten...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] minimal alpha pt_regs fixes
Al Viro [Sat, 7 Oct 2006 13:17:31 +0000 (14:17 +0100)]
[PATCH] minimal alpha pt_regs fixes

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] m68k pt_regs fixes
Al Viro [Sat, 7 Oct 2006 13:16:45 +0000 (14:16 +0100)]
[PATCH] m68k pt_regs fixes

m68k_handle_int() split in two functions: __m68k_handle_int() takes
pt_regs * and does set_irq_regs(); m68k_handle_int() doesn't get pt_regs
*.

Places where we used to call m68k_handle_int() recursively with the same
pt_regs have simply lost the second argument, the rest is switched to
__m68k_handle_int().

The rest of patch is just dropping pt_regs * where needed.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] reiserfs: null pointer dereferencing in reiserfs_read_bitmap_block
Eric Eric Sesterhenn [Sat, 7 Oct 2006 05:19:45 +0000 (22:19 -0700)]
[PATCH] reiserfs: null pointer dereferencing in reiserfs_read_bitmap_block

null pointer dereferencing in reiserfs_read_bitmap_block.

Signed-off-by: Alexander Zarochentsev <zam@namesys.com>
Cc: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] swsusp: Make userland suspend work on SMP again
Rafael J. Wysocki [Sat, 7 Oct 2006 05:19:44 +0000 (22:19 -0700)]
[PATCH] swsusp: Make userland suspend work on SMP again

Unfortunately one of the recent changes in swsusp has broken the userland
suspend on SMP.  Fix it.

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>
18 years ago[PATCH] slab: remove wrongly placed BUG_ON
Christoph Lameter [Sat, 7 Oct 2006 05:19:44 +0000 (22:19 -0700)]
[PATCH] slab: remove wrongly placed BUG_ON

Init list is called with a list parameter that is not equal to the
cachep->nodelists entry under NUMA if more than one node exists.  This is
fully legitimatei.  One may want to populate the list fields before
switching nodelist pointers.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[POWERPC] PReP fixup after irq changes
Olaf Hering [Fri, 6 Oct 2006 21:06:48 +0000 (23:06 +0200)]
[POWERPC] PReP fixup after irq changes

Compile fixes for PReP in ARCH=ppc.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[POWERPC] SPU fixup after irq changes
Olaf Hering [Fri, 6 Oct 2006 20:52:16 +0000 (22:52 +0200)]
[POWERPC] SPU fixup after irq changes

Remove struct pt_regs * from remaining spu irq functions.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[POWERPC] Fix up after irq changes
Olaf Hering [Sat, 7 Oct 2006 12:08:26 +0000 (22:08 +1000)]
[POWERPC] Fix up after irq changes

Remove struct pt_regs * from all handlers.
Also remove the regs argument from get_irq() functions.
Compile tested with arch/powerpc/config/* and
arch/ppc/configs/prep_defconfig

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[PARISC] More pt_regs removal
Matthew Wilcox [Sat, 7 Oct 2006 12:01:11 +0000 (06:01 -0600)]
[PARISC] More pt_regs removal

Remove pt_regs from ipi_interrupt and timer_interrupt.
Inline smp_do_timer() into its only caller, and unify the SMP and
non-SMP paths.  Fixes a profiling bug.

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
18 years ago[PARISC] pdc_init no longer exists
Matthew Wilcox [Sat, 7 Oct 2006 03:45:09 +0000 (23:45 -0400)]
[PARISC] pdc_init no longer exists

Just a stale prototype

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
18 years ago[PARISC] Make firmware calls irqsafe-ish...
Kyle McMartin [Fri, 6 Oct 2006 03:45:45 +0000 (23:45 -0400)]
[PARISC] Make firmware calls irqsafe-ish...

There's no reason why we shouldn't be using _irqsave instead of
_irq for any of these calls. fwiw, this fixes the
"start_kernel(): bug: interrupts were enabled early" message displayed
on bootup recently.

Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Signed-off-by: Matthew Wilcox <matthew@wil.cx>
18 years ago[PA-RISC] Fix boot breakage
Matthew Wilcox [Thu, 5 Oct 2006 04:57:28 +0000 (22:57 -0600)]
[PA-RISC] Fix boot breakage

Conditionals were the wrong way around.  Turns out I was booting the
wrong kernel when testing the original fix.

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
18 years ago[PARISC] Use set_irq_regs
Matthew Wilcox [Sat, 7 Oct 2006 11:11:07 +0000 (05:11 -0600)]
[PARISC] Use set_irq_regs

Actually set the irq_regs pointer.

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
18 years agoMerge branch 'irq-fixes' of git://git.parisc-linux.org/git/linux-2.6
Linus Torvalds [Sat, 7 Oct 2006 03:12:11 +0000 (20:12 -0700)]
Merge branch 'irq-fixes' of git://git.parisc-linux.org/git/linux-2.6

* 'irq-fixes' of git://git.parisc-linux.org/git/linux-2.6:
  Build fixes for struct pt_regs removal

18 years agoBuild fixes for struct pt_regs removal
Matthew Wilcox [Sat, 7 Oct 2006 02:47:23 +0000 (20:47 -0600)]
Build fixes for struct pt_regs removal

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
18 years ago[POWERPC] Fix iseries/smp.c for irq breakage
Stephen Rothwell [Fri, 6 Oct 2006 03:55:26 +0000 (13:55 +1000)]
[POWERPC] Fix iseries/smp.c for irq breakage

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[POWERPC] Fix viocons for irq breakage
Stephen Rothwell [Fri, 6 Oct 2006 03:54:28 +0000 (13:54 +1000)]
[POWERPC] Fix viocons for irq breakage

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[POWERPC] Update iseries_defconfig
Stephen Rothwell [Fri, 6 Oct 2006 03:53:12 +0000 (13:53 +1000)]
[POWERPC] Update iseries_defconfig

This make sure that an iseries_defconfig does not inlude
other platforms.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[POWERPC] Fix fsl_soc build breaks
Olof Johansson [Fri, 6 Oct 2006 02:16:48 +0000 (21:16 -0500)]
[POWERPC] Fix fsl_soc build breaks

Hrm, there's no way this ever built at time of merge. There's a missing } and
the wrong type on phy_irq.

Also, another const for get_property().

  CC      arch/powerpc/sysdev/fsl_soc.o
arch/powerpc/sysdev/fsl_soc.c: In function 'fs_enet_of_init':
arch/powerpc/sysdev/fsl_soc.c:625: error: assignment of read-only variable 'phy_irq'
arch/powerpc/sysdev/fsl_soc.c:625: warning: assignment makes integer from pointer without a cast
arch/powerpc/sysdev/fsl_soc.c:661: warning: assignment discards qualifiers from pointer target type
arch/powerpc/sysdev/fsl_soc.c:684: error: subscripted value is neither array nor pointer
arch/powerpc/sysdev/fsl_soc.c:687: error: subscripted value is neither array nor pointer
arch/powerpc/sysdev/fsl_soc.c:722: warning: ISO C90 forbids mixed declarations and code
arch/powerpc/sysdev/fsl_soc.c:728: error: invalid storage class for function 'cpm_uart_of_init'
arch/powerpc/sysdev/fsl_soc.c:798: error: initializer element is not constant
arch/powerpc/sysdev/fsl_soc.c:798: error: expected declaration or statement at end of input
make[1]: *** [arch/powerpc/sysdev/fsl_soc.o] Error 1

Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[PATCH] x86_64 irq_regs fix
Andrew Morton [Fri, 6 Oct 2006 20:28:09 +0000 (13:28 -0700)]
[PATCH] x86_64 irq_regs fix

smp_apic_timer_interrupt() needs to stack the pt_regs* for profile_tick.

If any other of those APIC interrupt handlers want to run get_irq_regs() then
their C entrypoint handlers will need the same treatment.

Cc: Andi Kleen <ak@muc.de>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Acked-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years agoARM: fix up nested irq regs usage
Linus Torvalds [Fri, 6 Oct 2006 20:11:15 +0000 (13:11 -0700)]
ARM: fix up nested irq regs usage

This should fix up the per-cpu irq register pointer if we have nested
hardware interrupts.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] ixp4xxdefconfig arm fixes
Frederik Deweerdt [Fri, 6 Oct 2006 18:58:24 +0000 (18:58 +0000)]
[PATCH] ixp4xxdefconfig arm fixes

With the following patch, the ixp4xxdefconfig builds correctly.  I'll
test some more configs if I get some time.

Signed-off-by: Frederik Deweerdt <frederik.deweerdt@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] fix mesh compile errors after irq changes
Olaf Hering [Fri, 6 Oct 2006 18:53:10 +0000 (20:53 +0200)]
[PATCH] fix mesh compile errors after irq changes

drivers/scsi/mesh.c:469: error: too many arguments to function 'mesh_interrupt'
drivers/scsi/mesh.c:507: error: too many arguments to function 'mesh_interrupt'

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years agoMerge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
Linus Torvalds [Fri, 6 Oct 2006 18:35:08 +0000 (11:35 -0700)]
Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
  [ALSA] version 1.0.13
  [ALSA] sound/pci/au88x0/au88x0.c: ioremap balanced with iounmap
  [ALSA] Handle file operations during snd_card disconnects using static file->f_op
  [ALSA] emu10k1: Fix outl() in snd_emu10k1_resume_regs()
  [ALSA] Repair snd-usb-usx2y for usb 2.6.18
  [ALSA] Fix bug in snd-usb-usx2y's usX2Y_pcms_lock_check()
  [ALSA] Dereference after free in snd_hwdep_release()
  [ALSA] Fix memory leak in sound/isa/es18xx.c
  [ALSA] hda-intel - New pci id for Nvidia MCP61
  [ALSA] Add new subdevice ids for hda-intel
  [ALSA] WM9712 fixes for ac97_patch.c
  [ALSA] hda/patch_si3054: new codec vendor IDs

18 years ago[ALSA] version 1.0.13
Jaroslav Kysela [Fri, 6 Oct 2006 18:28:26 +0000 (20:28 +0200)]
[ALSA] version 1.0.13

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
18 years ago[ALSA] sound/pci/au88x0/au88x0.c: ioremap balanced with iounmap
Amol Lad [Fri, 6 Oct 2006 14:45:19 +0000 (16:45 +0200)]
[ALSA] sound/pci/au88x0/au88x0.c: ioremap balanced with iounmap

Signed-off-by: Amol Lad <amol@verismonetworks.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
18 years ago[ALSA] Handle file operations during snd_card disconnects using static file->f_op
Karsten Wiese [Fri, 6 Oct 2006 14:08:27 +0000 (16:08 +0200)]
[ALSA] Handle file operations during snd_card disconnects using static file->f_op

Alsa used to kmalloc one file->f_op per file per disconnecting snd_card.
This led to oopses sometimes when file->f_op was freed before __fput()
finished.
Patch adds a virtual device for disconnect: VDD.
VDD consists of:
LIST_HEAD(shutdown_files)
    protected by DEFINE_SPINLOCK(shutdown_mutex)
static struct file_operations snd_shutdown_f_ops
    and functions assigned to it
Additions to struct snd_monitor_file
    to specify if instance is hidden by VDD or not.
A VDD's instance is
created in snd_card_disconnect() under the card->files_lock.
cleaned up in snd_card_file_remove() under the card->files_lock.

Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
18 years ago[ALSA] emu10k1: Fix outl() in snd_emu10k1_resume_regs()
Arnaud Patard [Wed, 4 Oct 2006 16:21:05 +0000 (18:21 +0200)]
[ALSA] emu10k1: Fix outl() in snd_emu10k1_resume_regs()

The emu10k1 driver saves the A_IOCFG and HCFG register on suspend and restores
it on resumes. Unfortunately, this doesn't work as the arguments to outl() are
reversed.

Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
18 years ago[ALSA] Repair snd-usb-usx2y for usb 2.6.18
Karsten Wiese [Wed, 4 Oct 2006 15:17:32 +0000 (17:17 +0200)]
[ALSA] Repair snd-usb-usx2y for usb 2.6.18

urb->start_frame rolls over beyond MAX_INT now.
This is for stable kernel and stable alsa.

Signed-off-by: Karsten Wiese <annabellesgarden@yahoo.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
18 years ago[ALSA] Fix bug in snd-usb-usx2y's usX2Y_pcms_lock_check()
Karsten Wiese [Wed, 4 Oct 2006 15:16:46 +0000 (17:16 +0200)]
[ALSA] Fix bug in snd-usb-usx2y's usX2Y_pcms_lock_check()

Fix bug in snd-usb-usx2y's usX2Y_pcms_lock_check()
substream can be NULL......
in mainline, bug was introduced by:
2006-06-22  [ALSA] Add O_APPEND flag support to PCM

Signed-off-by: Karsten Wiese <annabellesgarden@yahoo.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
18 years ago[ALSA] Dereference after free in snd_hwdep_release()
Florin Malita [Fri, 29 Sep 2006 10:55:25 +0000 (12:55 +0200)]
[ALSA] Dereference after free in snd_hwdep_release()

snd_card_file_remove() may free hw->card so we can't dereference
hw->card->module after that.
Coverity ID 1420.

Signed-off-by: Florin Malita <fmalita@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
18 years ago[ALSA] Fix memory leak in sound/isa/es18xx.c
Eric Sesterhenn [Thu, 28 Sep 2006 10:35:48 +0000 (12:35 +0200)]
[ALSA] Fix memory leak in sound/isa/es18xx.c

Fixed a memory leak in the error patch.

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
18 years ago[ALSA] hda-intel - New pci id for Nvidia MCP61
Dan Cyr [Tue, 26 Sep 2006 13:32:35 +0000 (15:32 +0200)]
[ALSA] hda-intel - New pci id for Nvidia MCP61

Added the new PCI id to support Nvidia MCP61 in snd-hda-intel driver.

Signed-off-by: Dan Cyr <rabidfly@hotmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
18 years ago[ALSA] Add new subdevice ids for hda-intel
Tobin Davis [Tue, 26 Sep 2006 13:30:10 +0000 (15:30 +0200)]
[ALSA] Add new subdevice ids for hda-intel

This patch adds a couple of device ids for Acer laptops.  In both cases,
the owners got the driver working by adding 'model=acer' to their
modprobe.conf files.

Signed-off-by: Tobin Davis <tdavis@dsl-only.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
18 years ago[ALSA] WM9712 fixes for ac97_patch.c
Luke Zhang [Tue, 26 Sep 2006 13:28:41 +0000 (15:28 +0200)]
[ALSA] WM9712 fixes for ac97_patch.c

This patch by Luke Zhang fixes a couple of issues with the WM9712
support in ac97_patch.c
Changes:-
 o Fix Out3 ZC switch invert.
 o Extend capture volume control to 6 bits.
 o Change Mic 1 volume mask to 5 bits (31).
 o Add Mic 2 volume.

Signed-off-by: Luke Zhang <lzhang@intrinsyc.com>
Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
18 years ago[ALSA] hda/patch_si3054: new codec vendor IDs
Sasha Khapyorsky [Tue, 26 Sep 2006 13:27:38 +0000 (15:27 +0200)]
[ALSA] hda/patch_si3054: new codec vendor IDs

There are additional IDs for Si3054 codec based HDA modems. Most of
them were discovered on discuss@linmodems.org list - Thanks to MarvS
and all linmodems.org folks.

Signed-off-by: Sasha Khapyorsky <sashak@alsa-project.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
18 years ago[PATCH] make kernels with CONFIG_X86_GENERIC and !CONFIG_SMP compilable
Jiri Kosina [Fri, 6 Oct 2006 09:11:56 +0000 (11:11 +0200)]
[PATCH] make kernels with CONFIG_X86_GENERIC and !CONFIG_SMP compilable

CONFIG_X86_GENERIC is not exclusively CONFIG_SMP, as mach-default/ could
be compiled also for UP archs. The patch fixes compilation error in
include/asm/mach-summit/mach_apic.h in case CONFIG_X86_GENERIC && !CONFIG_SMP

Signed-off-by: Jiri Kosina <jikos@jikos.cz>
Acked-by: Keith Mannthey <kmannth@us.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years agoMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Fri, 6 Oct 2006 18:08:57 +0000 (11:08 -0700)]
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Fix breakage from irq change

18 years agoInitial blind fixup for arm for irq changes
Linus Torvalds [Fri, 6 Oct 2006 17:53:39 +0000 (10:53 -0700)]
Initial blind fixup for arm for irq changes

Untested, but this should fix up the bulk of the totally mechanical
issues, and should make the actual detail fixing easier.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[IA64] Fix breakage from irq change
Tony Luck [Fri, 6 Oct 2006 17:09:41 +0000 (10:09 -0700)]
[IA64] Fix breakage from irq change

A few missed spots in ia64-land from this gigantic commit:

7d12e780e003f93433d49ce78cfedf4b4c52adc5

Signed-off-by: Tony Luck <tony.luck@intel.com>
18 years agoMerge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
Linus Torvalds [Fri, 6 Oct 2006 16:13:53 +0000 (09:13 -0700)]
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] Use CONFIG_GENERIC_TIME and define TOD clock source.
  [PATCH] sysrq: irq change build fix.
  [S390] irq change build fixes.
  [S390] cio: 0 is a valid chpid.
  [S390] monwriter buffer limit.
  [S390] ap bus poll thread priority.

18 years ago[PATCH] um: irq changes break build
Pekka Enberg [Fri, 6 Oct 2006 07:44:06 +0000 (00:44 -0700)]
[PATCH] um: irq changes break build

Fixup broken UML build due to 7d12e780e003f93433d49ce78cfedf4b4c52adc5
"IRQ: Maintain regs pointer globally rather than passing to IRQ handlers".

Cc: David Howells <dhowells@redhat.com>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Paolo "Blaisorblade" Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] knfsd: tidy up up meaning of 'buffer size' in nfsd/sunrpc
NeilBrown [Fri, 6 Oct 2006 07:44:05 +0000 (00:44 -0700)]
[PATCH] knfsd: tidy up up meaning of 'buffer size' in nfsd/sunrpc

There is some confusion about the meaning of 'bufsz' for a sunrpc server.
In some cases it is the largest message that can be sent or received.  In
other cases it is the largest 'payload' that can be included in a NFS
message.

In either case, it is not possible for both the request and the reply to be
this large.  One of the request or reply may only be one page long, which
fits nicely with NFS.

So we remove 'bufsz' and replace it with two numbers: 'max_payload' and
'max_mesg'.  Max_payload is the size that the server requests.  It is used
by the server to check the max size allowed on a particular connection:
depending on the protocol a lower limit might be used.

max_mesg is the largest single message that can be sent or received.  It is
calculated as the max_payload, rounded up to a multiple of PAGE_SIZE, and
with PAGE_SIZE added to overhead.  Only one of the request and reply may be
this size.  The other must be at most one page.

Cc: Greg Banks <gnb@sgi.com>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] md: fix bug where new drives added to an md array sometimes don't sync properly
NeilBrown [Fri, 6 Oct 2006 07:44:04 +0000 (00:44 -0700)]
[PATCH] md: fix bug where new drives added to an md array sometimes don't sync properly

This fixes a bug introduced in 2.6.18.

If a drive is added to a raid1 using older tools (mdadm-1.x or raidtools)
then it will be included in the array without any resync happening.

It has been submitted for 2.6.18.1.

Signed-off-by: Neil Brown <neilb@suse.de>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] mmc: multi sector write transfers
Pierre Ossman [Fri, 6 Oct 2006 07:44:03 +0000 (00:44 -0700)]
[PATCH] mmc: multi sector write transfers

SD cards extend the protocol by allowing the host to query a card how many
blocks were successfully stored on the medium.  This allows us to safely write
chunks of blocks at once.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] swarm: Actually initialize the IDE driver
Maciej W. Rozycki [Fri, 6 Oct 2006 07:44:02 +0000 (00:44 -0700)]
[PATCH] swarm: Actually initialize the IDE driver

This is required for the SWARM GenBus IDE interface to be recognized.

Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] sched: fix a kerneldoc error on is_init()
Henne [Fri, 6 Oct 2006 07:44:01 +0000 (00:44 -0700)]
[PATCH] sched: fix a kerneldoc error on is_init()

Fix a kerneldoc warning and reorderd the description for is_init().

Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Cc: "Randy.Dunlap" <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] MAINTAINERS: take over scx200-* and pc8736* drivers
Jim Cromie [Fri, 6 Oct 2006 07:43:59 +0000 (00:43 -0700)]
[PATCH] MAINTAINERS: take over scx200-* and pc8736* drivers

Add MAINTAINERS entries for new scx200_hrt and pc8736x_gpio drivers, and
take over maintenance of scx200_gpio, authored by Christer Weinigel (which
I've hacked at), who no longer has the hardware.

Also take over hwmon/pc87360, authored by Jean Delvare, who's dropped
maintenance to dedicate more time to hwmon subsystem.

Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: Christer Weinigel <christer@weinigel.se>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] Fix typo in "syntax error if percpu macros are incorrectly used" patch
Jan Blunck [Fri, 6 Oct 2006 07:43:58 +0000 (00:43 -0700)]
[PATCH] Fix typo in "syntax error if percpu macros are incorrectly used" patch

Trivial typo fix in the "syntax error if percpu macros are incorrectly
used" patch.  I misspelled "identifier" in all places.  D'Oh!

Thanks to Dirk Mueller to point this out.

Signed-off-by: Jan Blunck <jblunck@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] m68k: dma_alloc_coherent() has gfp_t as the last argument
Al Viro [Fri, 6 Oct 2006 07:43:58 +0000 (00:43 -0700)]
[PATCH] m68k: dma_alloc_coherent() has gfp_t as the last argument

annotate, fix the bogus argument of vmap() in it.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] m68k: fix NBPG define
Roman Zippel [Fri, 6 Oct 2006 07:43:57 +0000 (00:43 -0700)]
[PATCH] m68k: fix NBPG define

The recent header cleanup removed PAGE_SIZE from the exported information as
it depends on the configuration.

BTW This has possibly other consequences, as the core dump code is using
PAGE_SIZE directly, which may need fixing as well.

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] m68k: small system.h cleanup
Roman Zippel [Fri, 6 Oct 2006 07:43:56 +0000 (00:43 -0700)]
[PATCH] m68k: small system.h cleanup

avoid unnecessary xchg() use in set_mb()

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] m68k: fix typo in __generic_copy_to_user
Roman Zippel [Fri, 6 Oct 2006 07:43:56 +0000 (00:43 -0700)]
[PATCH] m68k: fix typo in __generic_copy_to_user

Jump to the correct exit label after exception

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] m68k: cleanup string functions
Roman Zippel [Fri, 6 Oct 2006 07:43:55 +0000 (00:43 -0700)]
[PATCH] m68k: cleanup string functions

- cleanup asm of string functions
- deinline strncat()/strncmp()
- provide non-inlined strcpy()

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] provide tickadj define
Roman Zippel [Fri, 6 Oct 2006 07:43:54 +0000 (00:43 -0700)]
[PATCH] provide tickadj define

Provide a tickadj compatibility define for archs still using it.

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] page fault retry with NOPAGE_REFAULT
Benjamin Herrenschmidt [Fri, 6 Oct 2006 07:43:53 +0000 (00:43 -0700)]
[PATCH] page fault retry with NOPAGE_REFAULT

Add a way for a no_page() handler to request a retry of the faulting
instruction.  It goes back to userland on page faults and just tries again
in get_user_pages().  I added a cond_resched() in the loop in that later
case.

The problem I have with signal and spufs is an actual bug affecting apps and I
don't see other ways of fixing it.

In addition, we are having issues with infiniband and 64k pages (related to
the way the hypervisor deals with some HV cards) that will require us to muck
around with the MMU from within the IB driver's no_page() (it's a pSeries
specific driver) and return to the caller the same way using NOPAGE_REFAULT.

And to add to this, the graphics folks have been following a new approach of
memory management that involves transparently swapping objects between video
ram and main meory.  To do that, they need installing PTEs from a no_page()
handler as well and that also requires returning with NOPAGE_REFAULT.

(For the later, they are currently using io_remap_pfn_range to install one PTE
from no_page() which is a bit racy, we need to add a check for the PTE having
already been installed afer taking the lock, but that's ok, they are only at
the proof-of-concept stage.  I'll send a patch adding a "clean" function to do
that, we can use that from spufs too and get rid of the sparsemem hacks we do
to create struct page for SPEs.  Basically, that provides a generic solution
for being able to have no_page() map hardware devices, which is something that
I think sound driver folks have been asking for some time too).

All of these things depend on having the NOPAGE_REFAULT exit path from
no_page() handlers.

Signed-off-by: Benjamin Herrenchmidt <benh@kernel.crashing.org>
Cc: Hugh Dickins <hugh@veritas.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] slab: reduce numa text size
Pekka Enberg [Fri, 6 Oct 2006 07:43:52 +0000 (00:43 -0700)]
[PATCH] slab: reduce numa text size

Reduce the NUMA text size of mm/slab.o a little on x86 by using a local
variable to store the result of numa_node_id().

    text    data     bss     dec     hex filename
   16858    2584      16   19458    4c02 mm/slab.o (before)
   16804    2584      16   19404    4bcc mm/slab.o (after)

[akpm@osdl.org: use better names]
[pbadari@us.ibm.com: fix that]
Cc: Christoph Lameter <christoph@lameter.com>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Badari Pulavarty <pbadari@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] ohci: don't play with IRQ regs
David Brownell [Fri, 6 Oct 2006 07:43:51 +0000 (00:43 -0700)]
[PATCH] ohci: don't play with IRQ regs

This is a more correct fix for the way the ohci hcd was referencing pt_regs
in the unlink paths.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] irq_reqs: export __irq_regs
Andrew Morton [Fri, 6 Oct 2006 07:43:50 +0000 (00:43 -0700)]
[PATCH] irq_reqs: export __irq_regs

Modules might want this.

Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] Fix WARN_ON / WARN_ON_ONCE regression
Andrew Morton [Fri, 6 Oct 2006 07:43:49 +0000 (00:43 -0700)]
[PATCH] Fix WARN_ON / WARN_ON_ONCE regression

Tim and Ananiev report that the recent WARN_ON_ONCE changes cause increased
cache misses with the tbench workload.  Apparently due to the access to the
newly-added static variable.

Rearrange the code so that we don't touch that variable unless the warning is
going to trigger.

Also rework the logic so that the static variable starts out at zero, so we
can move it into bss.

It would seem logical to mark the static variable as __read_mostly too.  But
it would be wrong, because that would put it back into the vmlinux image, and
the kernel will never read from this variable in normal operation anyway.
Unless the compiler or hardware go and do some prefetching on us?

For some reason this patch shrinks softirq.o text by 40 bytes.

Cc: Tim Chen <tim.c.chen@intel.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "Ananiev, Leonid I" <leonid.i.ananiev@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] kauditd_thread warning fix
Andrew Morton [Fri, 6 Oct 2006 07:43:48 +0000 (00:43 -0700)]
[PATCH] kauditd_thread warning fix

Squash this warning:

  kernel/audit.c: In function 'kauditd_thread':
  kernel/audit.c:367: warning: no return statement in function returning non-void

We might as test kthread_should_stop(), although it's not very pointful at
present.

The code which starts this thread looks racy - the kernel could start multiple
threads.

Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] i386: irqs build fix
Andrew Morton [Fri, 6 Oct 2006 07:43:48 +0000 (00:43 -0700)]
[PATCH] i386: irqs build fix

Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[S390] Use CONFIG_GENERIC_TIME and define TOD clock source.
Martin Schwidefsky [Fri, 6 Oct 2006 14:38:48 +0000 (16:38 +0200)]
[S390] Use CONFIG_GENERIC_TIME and define TOD clock source.

Fix too slow clock by using CONFIG_GENERIC_TIME and adding a
clock source for the s390 time-of-day clock. As added benefit
we get rid of the s390 specific definition of do_gettimeofday
and do_settimeofday.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
18 years ago[PATCH] sysrq: irq change build fix.
Heiko Carstens [Fri, 6 Oct 2006 14:38:42 +0000 (16:38 +0200)]
[PATCH] sysrq: irq change build fix.

drivers/char/sysrq.c: In function `sysrq_handle_crashdump':
drivers/char/sysrq.c:98: warning: implicit declaration of function `get_irq_regs'

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
18 years ago[S390] irq change build fixes.
Heiko Carstens [Fri, 6 Oct 2006 14:38:35 +0000 (16:38 +0200)]
[S390] irq change build fixes.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
18 years ago[S390] cio: 0 is a valid chpid.
Cornelia Huck [Fri, 6 Oct 2006 14:38:29 +0000 (16:38 +0200)]
[S390] cio: 0 is a valid chpid.

In order to determine chpid validity, we need to check whether the
corresponding path is specified in the pim.

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
18 years ago[S390] monwriter buffer limit.
Melissa Howland [Fri, 6 Oct 2006 14:38:26 +0000 (16:38 +0200)]
[S390] monwriter buffer limit.

Make max_bufs a global (per linux guest) limit.

Signed-off-by: Melissa Howland <melissah@us.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
18 years ago[S390] ap bus poll thread priority.
Christian Borntraeger [Fri, 6 Oct 2006 14:38:22 +0000 (16:38 +0200)]
[S390] ap bus poll thread priority.

The ap bus is supposed to have a low priority. We must use 19 instead
of -20, which is just the opposite.

Signed-off-by: Christian Borntraeger <cborntra@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
18 years ago[POWERPC] Minor fix for bootargs property
Geoff Levand [Thu, 5 Oct 2006 18:35:16 +0000 (11:35 -0700)]
[POWERPC] Minor fix for bootargs property

Avoid the use of an uninitialized stack variable when the powerpc device tree
bootargs property is either missing or incorrectly defined.  This also makes
CONFIG_CMDLINE work properly under these conditions.  This change adds a test
for the existence of the bootargs property.

early_init_dt_scan_chosen() tests for a zero length bootargs property in its
CONFIG_CMDLINE processing, but the current implementation of
of_get_flat_dt_prop() doesn't assign a value to the length when no property is
found.  Since an automatic variable is used, a stale value from the stack will
be used in the test.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[POWERPC] Update MTFSF_L() comment
Anton Blanchard [Thu, 5 Oct 2006 16:54:07 +0000 (02:54 +1000)]
[POWERPC] Update MTFSF_L() comment

David Woodhouse points out that the comment accompanying the MTFSF_L
macro is misleading. We should make it clear that the L bit is ignored
on older CPUS, not the entire instruction.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[POWERPC] Update pSeries defconfig for SATA
Brian King [Thu, 5 Oct 2006 15:52:04 +0000 (10:52 -0500)]
[POWERPC] Update pSeries defconfig for SATA

Since the ipr driver now supports SATA and depends on libata,
enable libata to get built.

Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[POWERPC] Don't get PCI IRQ from OF for devices with no IRQ
Benjamin Herrenschmidt [Thu, 5 Oct 2006 06:40:41 +0000 (16:40 +1000)]
[POWERPC] Don't get PCI IRQ from OF for devices with no IRQ

This patch adds checking of the PCI_INTERRUPT_PIN register before
using standard OF parsing to retreive PCI interrupts. The reason is
that some PCI devices may have no PCI interrupt, though they may have
interrupts attached via other means. In this case, we shall not use
irq->pdev, but device-specific code can later retreive those interrupts
instead.

Without that patch, Maple and derivatives don't get the right interrupt
for the second IDE channel as the linux IDE code fallsback to the PCI
irq instead of trying to use the legacy ones for the on-board controller
(which has no PCI_INTERRUPT_PIN). Having no PCI IRQ assign to it (as it
doesn't request any) fixes it.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[POWERPC] Fix zImage decompress location
Benjamin Herrenschmidt [Thu, 5 Oct 2006 04:18:46 +0000 (14:18 +1000)]
[POWERPC] Fix zImage decompress location

The zImage wrapper has a "hack" that force the decompression to happen
above 20Mb for 64 bits kernels, to work around issues with some
firmwares on the field. However, the new wrapper has a bug which makes
that hack not work properly. This fixes it.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[POWERPC] linux,tce-size property is 32 bits
Nathan Lynch [Thu, 5 Oct 2006 03:28:00 +0000 (22:28 -0500)]
[POWERPC] linux,tce-size property is 32 bits

The "linux,tce-size" property is only 32 bits (see
prom_initialize_tce_table() in arch/powerpc/kernel/prom_init.c).
Treating it as an unsigned long in iommu_table_setparms() leads to
access beyond the end of the property's buffer, so we pass garbage to
the memset() in that function.

[boot]0020 XICS Init
i8259 legacy interrupt controller initialized
[boot]0021 XICS Done
PID hash table entries: 4096 (order: 12, 32768 bytes)
cpu 0x0: Vector: 300 (Data Access) at [c0000000fe783850]
    pc: c000000000035e90: .memset+0x60/0xfc
    lr: c000000000044fa4: .iommu_table_setparms+0xb0/0x158
    sp: c0000000fe783ad0
   msr: 9000000000009032
   dar: c000000100000000
 dsisr: 42010000
  current = 0xc00000000450e810
  paca    = 0xc000000000411580
    pid   = 1, comm = swapper
enter ? for help
[link register   ] c000000000044fa4 .iommu_table_setparms+0xb0/0x158
[c0000000fe783ad0c000000000044f4c .iommu_table_setparms+0x58/0x158
(unreliable)
[c0000000fe783b70c00000000004529c
.iommu_bus_setup_pSeries+0x1c4/0x254
[c0000000fe783c00c00000000002b8ac .do_bus_setup+0x3c/0xe4
[c0000000fe783c80c00000000002c924 .pcibios_fixup_bus+0x64/0xd8
[c0000000fe783d00c0000000001a2d5c .pci_scan_child_bus+0x6c/0x10c
[c0000000fe783da0c00000000002be28 .scan_phb+0x17c/0x1b4
[c0000000fe783e40c0000000003cfa00 .pcibios_init+0x58/0x19c
[c0000000fe783ec0c0000000000094b4 .init+0x1e8/0x3d8
[c0000000fe783f90c000000000026e54 .kernel_thread+0x4c/0x68

Signed-off-by: Nathan Lynch <ntl@pobox.com>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[POWERPC] Add DTS for MPC8349E-mITX board
Timur Tabi [Wed, 4 Oct 2006 16:03:44 +0000 (11:03 -0500)]
[POWERPC] Add DTS for MPC8349E-mITX board

Add the DTS for the Freescale MPC 8349E-mITX reference board.  Contact
Vitesse for the driver for the VSC 7385.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[POWERPC] Fix harmless typo
Nick Piggin [Wed, 4 Oct 2006 15:25:44 +0000 (17:25 +0200)]
[POWERPC] Fix harmless typo

Fix a typo. Noticed by the unlikely profiler.

Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[PPC] Fix some irq breakage with ARCH=ppc
Paul Mackerras [Fri, 6 Oct 2006 11:09:40 +0000 (21:09 +1000)]
[PPC] Fix some irq breakage with ARCH=ppc

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[PATCH] powerpc: irq change build breaks
Olof Johansson [Fri, 6 Oct 2006 01:31:10 +0000 (20:31 -0500)]
[PATCH] powerpc: irq change build breaks

Fix up some of the buildbreaks from the irq handler changes.

Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years agoMerge git://git.infradead.org/~dhowells/irq-2.6
Linus Torvalds [Thu, 5 Oct 2006 23:32:01 +0000 (16:32 -0700)]
Merge git://git.infradead.org/~dhowells/irq-2.6

* git://git.infradead.org/~dhowells/irq-2.6:
  IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
  IRQ: Typedef the IRQ handler function type
  IRQ: Typedef the IRQ flow handler function type