Commits · e51ec143d344ab15102deba0f5c093ab4234a22c · nexedi / linux

02 Feb, 2005 40 commits

Merge bk://kernel.bkbits.net/vojtech/for-linus · e51ec143
Linus Torvalds authored Feb 01, 2005
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
e51ec143
Merge kernel.bkbits.net:/home/vojtech/input · 323d8fe1
Vojtech Pavlik authored Feb 02, 2005
```
into kernel.bkbits.net:/home/vojtech/for-linus
```
323d8fe1
Merge bkbits:input into suse.cz:/home/vojtech/bk/input · 24c39cd8
Vojtech Pavlik authored Feb 02, 2005

24c39cd8
input: Fix HID LED mapping. LEDs were ignored because the usage · 0c97171a
Vojtech Pavlik authored Feb 02, 2005
```
       value contains the page code in high 16 bits.
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
```
0c97171a
Merge silver.ucw.cz:/home/vojtech/bk/linus · 6522a6d0
Vojtech Pavlik authored Feb 02, 2005
```
into silver.ucw.cz:/home/vojtech/bk/input
```
6522a6d0
Merge kernel.bkbits.net:/home/vojtech/input · 0019d6d7
Vojtech Pavlik authored Feb 02, 2005
```
into kernel.bkbits.net:/home/vojtech/for-linus
```
0019d6d7
Merge kernel.bkbits.net:/home/torvalds/linux-2.6 · 320d015c
Vojtech Pavlik authored Feb 01, 2005
```
into kernel.bkbits.net:/home/vojtech/for-linus
```
320d015c

[PATCH] missing () in macros (alpha pgtable.h) · 1a9fa650

Alexander Viro authored Feb 01, 2005

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

1a9fa650

[PATCH] a couple of trivial sound/pci iomem annotations · 2705e647

Alexander Viro authored Feb 01, 2005

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

2705e647

[PATCH] several isdn trivial iomem annotations · 29920f68

Alexander Viro authored Feb 01, 2005

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

29920f68

[PATCH] sparc64 compat annotations · ffa56b35

Alexander Viro authored Feb 01, 2005

same story as for amd64 - ptr_to_compat() + normal __user annotations
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

ffa56b35

[PATCH] amd64 compat annotations · ae774bbf

Alexander Viro authored Feb 01, 2005

 * new helper - ptr_to_compat(); inverse to compat_ptr(), with proper
   typechecking.  A lot of open-coded equivalents replaced with using
   that one.
 * a couple of severely misguiding places got back to sanity - we had
   basically
	put_user((long)p, &foo->compat_uptr_t_field);

That will, of course, cast (long)p further - to u32, but that fact is
carefully obfuscated...  Sanitized by replacing (long)p in such places
with ptr_to_compat(p); fortunately, there hadn't been many of those...
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

ae774bbf

[PATCH] av7110_hw.c __user annotation · edbfa643

Alexander Viro authored Feb 01, 2005

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

edbfa643

[PATCH] utter weirdness in drivers/media/dvb/frontends/cx22700.c · e23fe6d2

Alexander Viro authored Feb 01, 2005

OK, #/* <multiline comment block> */ is legitimate C, but WTF had
these guys been smoking?
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

e23fe6d2

[PATCH] misc mtd sparse fixes · 66f57b16

Alexander Viro authored Feb 01, 2005

 * jedec - switched to C99 initializers
 * sun_uflash - removed bogus cast to void * in argument of iounmap() +
   NULL noise removal.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

66f57b16

[PATCH] long constants on amd64 · 4892cb2f

Alexander Viro authored Feb 01, 2005

missing UL in several places (and no, none of these constants is ever
seen by as(1))
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

4892cb2f

[PATCH] shpchprm_legacy.c trivial iomem annotations · 00668000

Alexander Viro authored Feb 01, 2005

trivial iomem annotations + missing void in several declarations
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

00668000

[PATCH] missing export (_tlbie()) · a7d4ac2d

Alexander Viro authored Feb 01, 2005

on some ppc subarchitectures flush_tlb_page() et.al.  are inlines
implemented via _tlbie(), so it should share the status...
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

a7d4ac2d

[PATCH] uaccess.h annotations · cab6869d

Alexander Viro authored Feb 01, 2005

the usual - __iomem in definition of __mm() on several platforms that
haven't got it by now, s/long/unsigned long/ for __gu_val in get_user(),
__force on places where we pass pointers to low-level __user-agnostic
primitive (__copy_tofrom_user() and its ilk).
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

cab6869d

[PATCH] more missing const in bitops prototypes · 92f60ed8

Alexander Viro authored Feb 01, 2005

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

92f60ed8

[PATCH] missing declaration in firmware.h · cf63e49e

Alexander Viro authored Feb 01, 2005

Not all users of firmware.h care about struct device (or include
device.h, for that matter).
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

cf63e49e

[PATCH] pktgen __user annotations · cfaac57a

Alexander Viro authored Feb 01, 2005

trivial __user annotations + C99 initializer in one struct...
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

cfaac57a

[PATCH] icom iomem annotations and NULL noise removals · d545a6bc

Alexander Viro authored Feb 01, 2005

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

d545a6bc

[PATCH] 64bit fixes (printks) · 6ef194f6

Alexander Viro authored Feb 01, 2005

the usual %d -> %zu for size_t
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

6ef194f6

[PATCH] cs461x iomem fixes and annotations · 5a0feb4b

Alexander Viro authored Feb 01, 2005

Annotated, fixed dereferncing iomem pointers (see note in driver re
testing it got)
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

5a0feb4b

[PATCH] missing include in r8169 · 68610f0f

Alexander Viro authored Feb 01, 2005

Missing include, breaks e.g. sparc64
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

68610f0f

[PATCH] block2mtd 64bit bug · f1430380

Alexander Viro authored Feb 01, 2005

Passing pointer to size_t to function that expects u32 * and actually
stores a value there... 
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

f1430380

[PATCH] *really* dumb typo in aacraid (cast to pointer to structure that doesn't exist ;-) · d6e45529

Alexander Viro authored Feb 01, 2005

spot the typo...  It's harmless, in a sense that code compiles right,
but...
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

d6e45529

[PATCH] rme9562 big-endian compile fix (dumb typo) · 1a1905f8

Alexander Viro authored Feb 01, 2005

hdsp->data used when fw->data should've been (BTW, another branch of
that ifdef is memcpy from fw->data to ->firmware_cache; this one
byteswaps). 
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1a1905f8

[PATCH] matrox_fb trivial compile fix for pmac · d857bd49

Alexander Viro authored Feb 01, 2005

module_param() used when module_param_named() should've been.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

d857bd49

[PATCH] wrong include in tda80xx.c · 5310026c

Alexander Viro authored Feb 01, 2005

should include asm/irq.h, not linux/irq.h (the latter should be moved to
asm-generic, IMO - we are getting *way* too many bugs of that sort). As
it is, tda80xx breaks on some platforms (at least on ARM).
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

5310026c

[PATCH] isp16 missing initcalls · 0c82d539

Alexander Viro authored Feb 01, 2005

 * isp16_init() should be an initcall in non-modular case - it's not
   called directly anymore (not since 2.5.1-pre2). 
 * isp16_init() and isp16_exit() made static, while we are at it.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

0c82d539

[PATCH] missing include in fore200e.c · 35986038

Alexander Viro authored Feb 01, 2005

We need delay.h there - on a lot of platforms it doesn't get pulled
indirectly and since we use udelay() now...
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

35986038

[PATCH] openpromfs property_read() fix · 622c36a6

Alexander Viro authored Feb 01, 2005

openpromfs property_read() is slightly abused by property_write() - the
latter calls property_read(file, NULL, 0, NULL) if we still hadn't done
any IO on that file; property_read() will do setup work and, since it's
called with count equal to 0, do nothing else.

That stopped working - now we check if *ppos is sane before doing
anything else and that, of course, oopses.  Trivial fix is to move the
check past that for count == 0...
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

622c36a6

Merge bk://kernel.bkbits.net/davem/sparc-2.6 · 00acc832
Linus Torvalds authored Feb 01, 2005
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
00acc832
Merge bk://bk.arm.linux.org.uk/linux-2.6-serial · 282388bc
Linus Torvalds authored Feb 01, 2005
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
282388bc
Merge bk://linux-scsi.bkbits.net/scsi-for-linus-2.6 · cebd0082
Linus Torvalds authored Feb 01, 2005
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
cebd0082
Manual merge of ARM assembly code clash. · fb2de489
Linus Torvalds authored Feb 01, 2005
```
I must be crazy, but it looked obvious enough. Check with rmk.
```
fb2de489

[ARM PATCH] 2447/1: IOP3xx PCI resource setup cleanup · accf94a1

Dave Jiang authored Feb 02, 2005

Patch from Dave Jiang

This cleans up the PCI mem and I/O resources assignments for all IOP
platforms. All addresses should be cleanly defined and correctly
assigned now.

Signed-off-by: Dave Jiang
Signed-off-by: Russell King

accf94a1

[ARM PATCH] 2444/1: GPIO23_SCLK_md now in uppercase in pxa-regs.h · 81914426

Michael Opdenacker authored Feb 02, 2005

Patch from Michael Opdenacker

"GPIO23_SCLK_md" renamed to "GPIO23_SCLK_MD" (uppercase)
in include/asm-arm/arch-pxa/pxa-regs.h.
Done for consistency with all other GPIO_*_MD settings.
No other file impacted in mainstream kernel sources.
Reported by Nicolas Pouillon.

Signed-off-by: Michael Opdenacker
Signed-off-by: Russell King

81914426