Commits · 7f357f99380cf5927ddd66e49d2ebc23f19814eb · nexedi / linux

29 Nov, 2004 12 commits

Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk · 7f357f99
Linus Torvalds authored Nov 28, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
7f357f99

[ARM PATCH] 2285/1: S3C2410 - regs-sdi.h fixes · 1cdfa0d9

Ben Dooks authored Nov 29, 2004

Patch from Ben Dooks

Fixes from Koen Martens to update the 
register definitions for the MMC/SD/SDIO interface,
tidied up for release with extra notes on what has
been depreceated in later silicon.

Signed-off-by: Koen Martens
Signed-off-by: Ben Dooks
Signed-off-by: Russell King

1cdfa0d9

[ARM PATCH] 2284/1: S3C2410 - core device registration update · 2493b8ae

Ben Dooks authored Nov 29, 2004

Patch from Ben Dooks

If one of the devices fails to register, do not
remove any registered devices and continue registering
in case any more devices register.

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

2493b8ae

[ARM] ARMv6 always selects correct user operations at runtime. · 0a4450c5
Russell King authored Nov 29, 2004

0a4450c5

[PATCH] Change MCA maintainer · caf39373

James Bottomley authored Nov 28, 2004

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

caf39373

[PATCH] video: semicolon bug in atyfb_base.c · decaed05

Domen Puncer authored Nov 28, 2004

Indentiation and logic suggest this was wrong.
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

decaed05

[PATCH] cciss: Off-by-one error causing oops in CCISS_GETLUNIFO ioctl · 2c9f8805

Andrew Patterson authored Nov 28, 2004

This patch fixes an an "off-by-one" error found in the CCISS_GETLUNIFO
ioctl in the cciss driver. It is cycling through the part table of the
gendisk structure which is a zero-based array, not a one-based array. This
often causes an oops when referencing the out-of-bounds element.

Signed-off by: Andrew Patterson <andrew.patterson@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2c9f8805

[PATCH] fbdev: Fix crash if fb_set_var() called before register_framebuffer() · 8c46a631

Antonino Daplas authored Nov 28, 2004

The field info->modelist is initialized during register_framebuffer.  This
field is also referred to in fb_set_var().  Thus a call to fb_set_var()
before register_framebuffer() will cause a crash.  A few drivers do this,
notably controlfb.  (This might fix reports of controlfb crashing in
powermacs).
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

8c46a631

[PATCH] x86_64: Fix lost edge triggered irqs on UP kernel · 18b98872

Andi Kleen authored Nov 28, 2004

Patch from Petr Vandrovec <vandrove@vc.cvut.cz>

Recently I've observed problems with IDE disks while running UP kernel on
x86-64 - it complained a lot about lost irq from hda/hdc.  I tracked
problem down to the problem that at enable_irq() code calls
hw_resend_irq(), but on x86-64 hw_resend_irq() does something useful only
when CONFIG_SMP is defined, on UP systems it does nothing.

Due to this IRQ is lost - and when IDE retries command, it can again happen
that IRQ is delivered before IDE code does enable_irq(), and again and
again, unless due to drive being lazy finally once kernel does enable_irq()
before drive prepares its answer, and things move forward ...  to next lost
IRQ.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

18b98872

[PATCH] v4l: fix permissions on module parameters exported via sysfs · d7408126

Dmitry Torokhov authored Nov 28, 2004

Fix permissions on module parameters exported via sysfs.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

d7408126

[PATCH] RLIMIT_MEMLOCK accounting of shmctl() SHM_LOCK is broken · 193aa382

Michael Kerrisk authored Nov 28, 2004

The accounting of shmctl() SHM_LOCK memory locks against the user
structure is broken.  The check of the size of the to-be-locked region
is based on the size of the segment as specified when it was created by
shmget() (this size is *not* rounded up to a page boundary).

Fix it by rounding the size properlt.  Also, tune up the spinlock
coverage in there a little.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

193aa382

[PATCH] e100 deadlock fix · 8b92757d

Andrew Morton authored Nov 28, 2004

Revert my version of this fix and apply Scott's version, which was acked by
the e100 maintainers.

Also, initialise the spinlocks before calling e100_hw_reset(), so things don't
instantly deadlock on SMP.
Signed-off-by: Scott Feldman <sfeldma@pobox.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

8b92757d

28 Nov, 2004 15 commits

Merge bk://bk.arm.linux.org.uk/linux-2.6-mmc · ceaa57fe
Linus Torvalds authored Nov 27, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
ceaa57fe
Merge bk://bk.arm.linux.org.uk/linux-2.6-serial · e527f34c
Linus Torvalds authored Nov 27, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
e527f34c
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk · 87c602b7
Linus Torvalds authored Nov 27, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
87c602b7

[ARM PATCH] 2280/1: [PATCH] SIMpad: Change maintainer to me · ab21adf1

Holger Freyther authored Nov 28, 2004

Patch from Holger Hans Peter Freyther

Line numbers could depend on 2279/1

Change the maintainer of the SIMpad board to me. This change was discussed on the simpad linux mailinglist and was supported by the former maintainer of SIMpad. I'll subscribe and introduce myself shortly on the arm linux mailinglist and ask for SIMpad not to be removed.

Signed-off-by: Holger Hans Peter Freyther
Signed-off-by: Russell King

ab21adf1

[ARM PATCH] 2279/1: [PATCH] SIMpad: Add a mq200 device to the platform bus · a505815a

Holger Freyther authored Nov 28, 2004

Patch from Holger Hans Peter Freyther

The SIMpad uses the MediaQ 200 framebuffer device. There is no driver in the vanilla kernel for that device. But adding the device to the platform bus makes it possible to just drop the mq200 driver into the kernel and the display will work.
Please consider applying the patch.

Signed-off-by: Holger Hans Peter Freyther
Signed-off-by: Russell King

a505815a

[ARM PATCH] 2278/1: [PATCH] SIMpad: add a default config · b65f05a2

Holger Freyther authored Nov 28, 2004

Patch from Holger Hans Peter Freyther

Add a default config file for simpad


Signed-off-by: Holger Hans Peter Freyther
Signed-off-by: Russell King

b65f05a2

[ARM PATCH] 2277/1: [PATCH] SIMpad: fix warnings emitted by the compiler · 945ffb27

Holger Freyther authored Nov 28, 2004

Patch from Holger Hans Peter Freyther

Fix warnings emitted by the compiler for
leds-simpad.c and sa1100_simpad.c

Signed-off-by: Holger Hans Peter Freyther
Signed-off-by: Russell King

945ffb27

[ARM PATCH] 2276/1: [PATCH] SIMpad: make simpad.c compile · 71fa90f7

Holger Freyther authored Nov 28, 2004

Patch from Holger Hans Peter Freyther

Fix compile of simpad.c ....

Signed-off-by: Holger Hans Peter Freyther
Signed-off-by: Russell King

71fa90f7

[PATCH] iomem annotations and fixes + isa_-ectomy in msnd · 8c6b3424

Alexander Viro authored Nov 27, 2004

 * switched to ioremap() + normal operations
 * split msnd_fifo_write() (and msnd_fifo_read()) into iomem and normal
   versions (original was even worse - it used to do __user and __iomem
   versions in the same code and in atomic context; when that bogosity
   got fixed, the difference between these cases (now normal memory and
   iomem) had been lost).
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

8c6b3424

[PATCH] misc drivers/atm iomem annotations and NULL noise removal · dbdc3bfe

Alexander Viro authored Nov 27, 2004

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

dbdc3bfe

[PATCH] swim3 __user annotation · 4dfc0d48

Alexander Viro authored Nov 27, 2004

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

4dfc0d48

[PATCH] wd7000 iomem annotations and fixes · 17675db1

Alexander Viro authored Nov 27, 2004

direct dereferencing of iomem pointer (by memcmp())
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

17675db1

[PATCH] seagate iomem annotations, cleanup and isa_-ectomy · e3e092b7

Alexander Viro authored Nov 27, 2004

 * switched to ioremap()
 * switched to normal iomem operations
 * killed a bunch of phys_to_virt()
 * killed open-coded (and inferior) instances of memcpy_toio()/memcpy_fromio().
 * fixed a dumb typo introduced in "kill off isa_check_signature()"
   patch (sorry - missed the fact that it was not covered by
   allmodconfig and didn't verify until after sending the patch in
   question ;-/). 
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

e3e092b7

[PATCH] dtc iomem annotations and isa_-ectomy · c11e5992

Alexander Viro authored Nov 27, 2004

switched to ioremap() + normal iomem operations
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

c11e5992

[PATCH] t128 iomem annotations and isa_-ectomy · efd436f8

Alexander Viro authored Nov 27, 2004

switched to ioremap() + normal iomem primitives.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

efd436f8

27 Nov, 2004 13 commits

[ARM PATCH] 2271/3: MMC for Mainstone/PXA27x · 1ca3acaf

Nicolas Pitre authored Nov 27, 2004

Patch from Nicolas Pitre

... with a bit of reorg to make the core code a bit more generic too.

Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King

1ca3acaf

[ARM] icside: ensure interfaces are probed and correctly setup. · f42aef2a
Russell King authored Nov 27, 2004

f42aef2a

[ARM PATCH] 2275/1: S3C2410 - serial rx fifo full check · 1fbe966f

Ben Dooks authored Nov 27, 2004

Patch from Ben Dooks

Check for the serial rx fifo full before checking
for the fifo size.

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

1fbe966f

[PATCH] isa_check_signature() finally gone · 4eb10382

Alexander Viro authored Nov 27, 2004

last callers of isa_check_signature() switched to ioremap() +
check_signature()
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

4eb10382

[PATCH] misc iomem annotations · 0936015f

Alexander Viro authored Nov 27, 2004

Each chunk is independent from the rest, so it could've been split
further, but IMO there's no point.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

0936015f

[PATCH] mtd/maps trivial annotations · fde3ac85

Alexander Viro authored Nov 27, 2004

NULL noise removal, missing __iomem in a couple of declarations, removal
of bogus cast to void * in iounmap() calls.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

fde3ac85

[PATCH] iomem annotations and isa_-ectomy: media/video/pms.c · 64b9a359

Alexander Viro authored Nov 27, 2004

switched to ioremap() + normal iomem access primitives
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

64b9a359

[PATCH] partial fc4 iomem annotations · 7f7f54ca

Alexander Viro authored Nov 27, 2004

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

7f7f54ca

[ARM] sa1111: don't reference dev->power.saved_state if CONFIG_PM is unset · 20dbeaf0
Russell King authored Nov 27, 2004

20dbeaf0
[SERIAL] imx: remove two unnecessary includes · 97e4d229
Russell King authored Nov 27, 2004

97e4d229

[PATCH] misc sparc iomem annotations · 1b2b5244

Alexander Viro authored Nov 27, 2004

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

1b2b5244

[PATCH] sunbpp iomem annotations · 0c17d846

Alexander Viro authored Nov 27, 2004

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

0c17d846

[PATCH] pmac_zilog iomem annotations · 9a903d42

Alexander Viro authored Nov 27, 2004

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

9a903d42