Commits · e5fb55493d54530850312ece6c46bad3f8472817 · Kirill Smelkov / linux

20 Oct, 2004 40 commits

Merge bk://kernel.bkbits.net/davem/sparc-2.6 · e5fb5549
Linus Torvalds authored Oct 20, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
e5fb5549

[PATCH] qla1820 iomem annotations · 8706e234

Alexander Viro authored Oct 20, 2004

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

8706e234

[PATCH] ioremap cleanups in aic7xxx · 10024c21

Alexander Viro authored Oct 20, 2004

	ioremap() is capable of dealing with addresses that are not
page-aligned; no need to duplicate that in driver.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

10024c21

[PATCH] aac7xxx iomem annotations · ad28656e

Alexander Viro authored Oct 20, 2004

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

ad28656e

[PATCH] nsp32 iomem annotations · c8d53504

Alexander Viro authored Oct 20, 2004

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

c8d53504

[PATCH] megaraid iomem annotations · 248ff3dd

Alexander Viro authored Oct 20, 2004

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

248ff3dd

[PATCH] ips iomem annotations · 56e0c3a9

Alexander Viro authored Oct 20, 2004

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

56e0c3a9

[PATCH] ipr iomem annotations · b797cab3

Alexander Viro authored Oct 20, 2004

	Annotated.  Original reused the structure that contained pointers into
remapped iomem for storing offsets in such area, so we need to split that
beast.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

b797cab3

[PATCH] isurf iomem annotations · a0975992

Alexander Viro authored Oct 20, 2004

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

a0975992

[PATCH] teles{0,pci} iomem annotations · 5f432304

Alexander Viro authored Oct 20, 2004

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

5f432304

[PATCH] kyro iomem annotations · ba2dfe24

Alexander Viro authored Oct 20, 2004

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

ba2dfe24

[PATCH] skystar2 iomem annotations · b1be8f75

Alexander Viro authored Oct 20, 2004

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

b1be8f75

[PATCH] sx.c iomem annotations and fixes · 82477fa4

Alexander Viro authored Oct 20, 2004

a bunch of missing readb() and check of 64Kb alignment of physical address
done on remapped one.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

82477fa4

[PATCH] if_ppp.h __user annotation · a962bb7a
Alexander Viro authored Oct 20, 2004
```
annotated ioctl structure
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
```
a962bb7a

[PATCH] sparc32 kconfig fixes · f878ebd9

Alexander Viro authored Oct 20, 2004

	a) CONFIG_VT should set CONFIG_INPUT
	b) parport_pc and serial/8250 are broken for sparc32 same as for
sparc64
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

f878ebd9

[PATCH] moxa iomem annotations · 2e719f1d

Alexander Viro authored Oct 20, 2004

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

2e719f1d

Merge bk://bart.bkbits.net/ide-2.6 · 945fb655
Linus Torvalds authored Oct 20, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
945fb655

[ide] unify PIO code · 01b81c2d

Bartlomiej Zolnierkiewicz authored Oct 20, 2004

Use PIO code from ide-taskfile.c in ide-disk.c so:
* drive status is checked after PIO read
* request is failed if invalid data phase
  is detected during PIO write
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

01b81c2d

[ide] ide-disk: unify PIO write/multiwrite code · cce7fdab

Bartlomiej Zolnierkiewicz authored Oct 20, 2004

Merge multwrite_intr() into write_intr().

The only change in functionality is that rq->errors is
now also cleared for multiwrite PIO (if there is no error).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

cce7fdab

[ide] sg PIO for fs requests · c1379b8c

Bartlomiej Zolnierkiewicz authored Oct 20, 2004

Convert CONFIG_IDE_TASKFILE_IO=n code
to use scatterlists for PIO transfers.

Fixes longstanding 'data integrity on error'
issue and makes barriers work with PIO.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

c1379b8c

[ide] sg PIO for taskfile requests · 680b8968

Bartlomiej Zolnierkiewicz authored Oct 20, 2004

Use scatterlists for taskfile based PIO transfers
instead of directly walking rq->[bio,cbio] lists.

If CONFIG_IDE_TASKFILE_IO is defined
this code will be used for fs requests.

ide_pio_sector() is based on ata_pio_sector()
from libata-core.c so kudos to Jeff.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

680b8968

[ide] always allocate hwif->sg_table · 2e879618

Bartlomiej Zolnierkiewicz authored Oct 20, 2004

Allocate hwif->sg_table in hwif_init() so it can also be used for PIO.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

2e879618

[ide] pmac: use more ide_hwif_t fields · f98ac82a

Bartlomiej Zolnierkiewicz authored Oct 20, 2004

Use dmatable_dma, sg_table, sg_nents and sg_dma_direction fields
of ide_hwif_t and remove their equivalents from pmac_ide_hwif_t.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

f98ac82a

[PATCH] i2o: missing bits from merge · a9ce9706

Andrew Morton authored Oct 20, 2004

A couple of functions got themselves lost.

cc: <Markus.Lidel@shadowconnect.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

a9ce9706

[PATCH] v4l: missing bits · de9c9143

Andrew Morton authored Oct 20, 2004

Missing parts of the v4l update

Cc: Gerd Knorr <kraxel@bytesex.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

de9c9143

Merge http://linux-watchdog.bkbits.net/linux-2.6-watchdog · 4896f66e
Linus Torvalds authored Oct 20, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
4896f66e
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk · 178f5312
Linus Torvalds authored Oct 20, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
178f5312

[ARM] Add seqlocking to timers. · 9969beed

Russell King authored Oct 20, 2004

Sometimes, it's useful to have locking.  Especially when we're
talking about time keeping.

It would appear that shemminger's patch of 5th February 2003
completely missed updating _ANY_ ARM timer implementations and,
because linux-arch didn't exist at the time, there appears to
have been no notification to any architecture developer that
maybe, just maybe, some work was required.

One wonders how many other changes are in the kernel which
architecture maintainers have missed.

9969beed

[ARM] Export find_{first,next}_bit_{l,b}e · fb3b720c
Russell King authored Oct 20, 2004

fb3b720c

[ARM] Cleanup some quirks. · 3ab146c9

Russell King authored Oct 20, 2004

- Ensure FIQs are enabled when cpu_idle() is called.
- Remove unused members of irq_cpustat_t.
- Remove unnecessary #ifndef CONFIG_SMP...#endif around irq_exit()
  macro.
- Rename __stf/__clf such that it stresses that they affect only
  local state (as per local_irq_xxx).
- Move THREAD_SIZE such that it can be used in current_thread_info()

3ab146c9

[SPARC64]: Update defconfig. · 459bd829
David S. Miller authored Oct 20, 2004
```
Signed-off-by: David S. Miller <davem@davemloft.net>
```
459bd829
[IEEE1394]: ohci1394.c/pcylynx.c need asm/irq.h · 1aac4505
David S. Miller authored Oct 20, 2004
```
Signed-off-by: David S. Miller <davem@davemloft.net>
```
1aac4505
[SPARC64]: Make iomap.o obj-y instead of lib-y for module exports. · f5939403
David S. Miller authored Oct 20, 2004
```
Signed-off-by: David S. Miller <davem@davemloft.net>
```
f5939403
Merge bk://kernel.bkbits.net/davem/sparc-2.6 · a8ff8803
Linus Torvalds authored Oct 19, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
a8ff8803
Merge bk://kernel.bkbits.net/davem/net-2.6 · 383fd49e
Linus Torvalds authored Oct 19, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
383fd49e

[PATCH] typhoon build fix · 25cc76cf

Andrew Morton authored Oct 19, 2004

Fix incorrect attempt to doubly-initialise the ethtool ops.

Cc: <jgarzik@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

25cc76cf

[PATCH] doc: scsihosts parameter no longer exists · e8166f0e

Phil Oester authored Oct 19, 2004

The scsihosts boot parameter was removed in 2.5.73, but references to it
still exist in docs.  Cleanup below.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

e8166f0e

[PATCH] ext3 directio block leak fix · edafeee3

Stephen C. Tweedie authored Oct 19, 2004

The orphan list holds inodes that need to be truncated on recovery.  In the
O_DIRECT case, it's used if we extend the inode --- the truncate on recovery
means we'll recover the newly-allocated disk blocks if we crash after the IO
starts but before i_size is updated on disk.

Now, the orphan list is *also* used to delete inodes that are unlinked but
still-open.  Those get truncated but also deleted on recovery.

The orphan list is held both in memory and on disk.  So the rules are that the
inode can't be reclaimed while on the orphan list.  There are only two cases
--- either the inode is actively being written(O_DIRECT) or truncated (in
which case the inode is by definition not going to be reused), or it's
unlinked but still open (again, non-reclaimable).

But in the case where you're truncating or write(O_DIRECT)ing a file that is
*ALSO* unlinked, there's a problem --- the final unlink would put the inode on
the orphan list, but the write/truncate would try to add/remove it.  End
result is that the inode disappears from the orphan list while it's still
unlinked-but-in-use.

That's just a leak-on-crash, it's not going to be detectable in normal use. 
But it's still a bug, and the way we fix it is for direct-IO and truncate not
to do the ext3_orphan_del if the file is unlinked (ie.  i_nlink==0).
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

edafeee3

[PATCH] nfs4 lease: add the new lock manager callbacks to the documentation · 4003261d

William A. Adamson authored Oct 19, 2004

Add the new lock manager callbacks to the documentation
Signed-off-by: Andy Adamson <andros@citi.umich.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

4003261d

[PATCH] nfs4 lease: export remove_lease · 1cb697f8

William A. Adamson authored Oct 19, 2004

Export remove_lease(), an interface to time_out_leases() with an
fl_break_time in the past.  needed by nfsd
Signed-off-by: Andy Adamson <andros@citi.umich.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1cb697f8