Commits · 5a42b81f03b756116f982e72838bc358bc4e460f · Kirill Smelkov / linux

09 Oct, 2006 13 commits

[PATCH] s390 traps.c __user annotations · 5a42b81f

Al Viro authored Oct 09, 2006

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

5a42b81f

[PATCH] hppfs: readdir callback missed in prototype change · c8adf94a
Al Viro authored Oct 09, 2006
```
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
```
c8adf94a

[PATCH] dlm gfp_t annotations · 38d6fd26

Al Viro authored Oct 09, 2006

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

38d6fd26

[PATCH] wrong order of arguments in copy_to_user() in ncpfs · 5c09d96b
Al Viro authored Oct 09, 2006
```
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
```
5c09d96b

[PATCH] mv64630_pic NULL noise removal · 8dc42f9e

Al Viro authored Oct 09, 2006

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

8dc42f9e

[PATCH] trivial iomem annotations (arch/powerpc/platfroms/parsemi/pci.c) · 7c84ace9

Al Viro authored Oct 09, 2006

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

7c84ace9

[PATCH] extern doesn't make sense on a definition of function... · f3d2ab41
Al Viro authored Oct 09, 2006
```
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
```
f3d2ab41

[PATCH] more ia64 irq handlers · a23b7cb9

Al Viro authored Oct 09, 2006

Cast to (void *) in request_irq() argument is stupid and
only hides problems...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

a23b7cb9

[PATCH] fallout from alpha pt_regs patches · 041a6bae

Al Viro authored Oct 09, 2006

missed irq handler in sys_titan and forgotten prototype update.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

041a6bae

[PATCH] sparc64 irq pt_regs fallout · 63540ba3

Al Viro authored Oct 09, 2006

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

63540ba3

[PATCH] m68k/kernel/dma.c assumes !MMU_SUN3 · 58ba81db

Al Viro authored Oct 09, 2006

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

58ba81db

[PATCH] arm: it's OK to pass pointer to volatile as iounmap() argument... · 1622605c
Al Viro authored Oct 09, 2006
```
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
```
1622605c

Fix extraneous '&' in recent NFS client cleanup · 83250493

Linus Torvalds authored Oct 08, 2006

We should pass "wait_event_interruptible()" the wait-queue itself, not
the pointer to it. The magic macro will pointerize it internally.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

83250493

08 Oct, 2006 27 commits

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 61ce7b3a

Linus Torvalds authored Oct 08, 2006

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Cleanup unnecessary <asm/ptrace.h> inclusions.
  [MIPS] DEC: pt_regs fixes for buserror handlers
  [MIPS] Fix return type of gt64120_irq.
  [MIPS] Ocelot C: Build fix - ll_mv64340_irq takes no more regs argument.
  [MIPS] Jazz defconfig file.
  [MIPS] Jazz: build fix - include <linux/screen_info.h>
  [MIPS] Jazz: Remove warning.  After 7 years probably somebody test this ;)
  [MIPS] Jazz: Fix I/O port resources.
  [MIPS] DEC: pt_regs fixes for dec_intr_halt.
  handle_sysrq lost its pt_regs * argument

Manual conflict resolved in arch/um/drivers/mconsole_kern.c

61ce7b3a

[PATCH] uml pt_regs fixes · 7bea96fd

Al Viro authored Oct 08, 2006

Real fix for UML pt_regs stuff.  Note set_irq_regs() logics in there...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

7bea96fd

[MIPS] Cleanup unnecessary <asm/ptrace.h> inclusions. · 27f76819
Ralf Baechle authored Oct 09, 2006
```
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
```
27f76819
[MIPS] DEC: pt_regs fixes for buserror handlers · 6dab2f45
Ralf Baechle authored Oct 09, 2006
```
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
```
6dab2f45
[MIPS] Fix return type of gt64120_irq. · 65542070
Ralf Baechle authored Oct 08, 2006
```
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
```
65542070
[MIPS] Ocelot C: Build fix - ll_mv64340_irq takes no more regs argument. · d864b96b
Ralf Baechle authored Oct 08, 2006
```
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
```
d864b96b
[MIPS] Jazz defconfig file. · de4f742b
Ralf Baechle authored Oct 08, 2006
```
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
```
de4f742b
[MIPS] Jazz: build fix - include <linux/screen_info.h> · 06e80113
Ralf Baechle authored Oct 08, 2006
```
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
```
06e80113
[MIPS] Jazz: Remove warning. After 7 years probably somebody test this ;) · 3bdcdd68
Ralf Baechle authored Oct 08, 2006
```
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
```
3bdcdd68

[MIPS] Jazz: Fix I/O port resources. · 2cf69e76

Ralf Baechle authored Oct 08, 2006

struct resource members were shuffeled a while ago.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

2cf69e76

[MIPS] DEC: pt_regs fixes for dec_intr_halt. · d62801e9
Ralf Baechle authored Oct 08, 2006
```
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
```
d62801e9
handle_sysrq lost its pt_regs * argument · b104189c
Ralf Baechle authored Oct 09, 2006
```
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
```
b104189c

Revert "[POWERPC] Don't get PCI IRQ from OF for devices with no IRQ" · e24bb60e

Linus Torvalds authored Oct 08, 2006

This reverts commit 41550c51.

Quoth Ben Herrenschmidt:
 "Please revert this one for now.  It seems to break G5s :( Looks like
  PCI cells inside Apple IO ASICs don't have a PCI_INTERRUPT_LINE set.
  I need to figure out a better fix."
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

e24bb60e

[PATCH] NFS: Fix typo in nfs_get_client() · 0bae89ec

Trond Myklebust authored Oct 08, 2006

Commit ca4aa096 fixed waiting for the
structure to get initialised, but it is also possible to break out of
the loop while still in TASK_INTERRUPTIBLE.

Replace the whole thing by wait_event_interruptible, which is much more
readable, and doesn't suffer from these problems.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

0bae89ec

[PATCH] linux/io.h needs types.h · cb1055fb

Al Viro authored Oct 08, 2006

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

cb1055fb

[PATCH] missing forward declaration of pt_regs (asm-m68k/signal.h) · 9288d1a3
Al Viro authored Oct 08, 2006
```
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
```
9288d1a3

[PATCH] missing include of scatterlist.h · a8f47c45

Al Viro authored Oct 08, 2006

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

a8f47c45

[PATCH] missing include in pdaudiocf_irq · 97432886

Al Viro authored Oct 08, 2006

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

97432886

[PATCH] misc ppc pt_regs fixes · 9da3b1ad

Al Viro authored Oct 08, 2006

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

9da3b1ad

[PATCH] misc arm pt_regs fixes · 28431146

Al Viro authored Oct 08, 2006

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

28431146

[PATCH] missed ia64 pt_regs fixes · 5dcded1b

Al Viro authored Oct 08, 2006

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

5dcded1b

[PATCH] alpha pt_regs cleanups: collapse set_irq_regs() in titan_dispatch_irqs() · 2f116cbf

Al Viro authored Oct 08, 2006

titan_dispatch_irqs() always gets get_irq_regs() as argument; kill
the argument and collapse set_irq_regs() in body.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2f116cbf

[PATCH] alpha pt_regs cleanups: machine_check() · 4fa1970a

Al Viro authored Oct 08, 2006

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>

4fa1970a

[PATCH] alpha pt_regs cleanups: handle_irq() · 3dbb8c62

Al Viro authored Oct 08, 2006

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>

3dbb8c62

[PATCH] alpha pt_regs cleanups: device_interrupt · 7ca56053

Al Viro authored Oct 08, 2006

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>

7ca56053

[PATCH] m68k pt_regs fixes, part 2 · 8dab42a9

Al Viro authored Oct 08, 2006

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>

8dab42a9

[PATCH] sparc32 rwlock fix · 7a39f522

Al Viro authored Oct 08, 2006

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>

7a39f522