summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-04-22 12:44:16 +0200
committerIngo Molnar <mingo@elte.hu>2009-04-22 12:44:20 +0200
commit3568b71d46bea87da1936902b6fbb2a3b1154b3d (patch)
tree621ba4ccef15b87ce16f0fc2cc1e9b2a3f565ffc /Documentation
parent2a3313f494c2f3f74a27d66f0f14b38558b7dba2 (diff)
parent091069740304c979f957ceacec39c461d0192158 (diff)
downloadlinux-3.10-3568b71d46bea87da1936902b6fbb2a3b1154b3d.tar.gz
linux-3.10-3568b71d46bea87da1936902b6fbb2a3b1154b3d.tar.bz2
linux-3.10-3568b71d46bea87da1936902b6fbb2a3b1154b3d.zip
Merge commit 'v2.6.30-rc3' into x86/urgent
Merge reason: hpet.c changed upstream, make sure we test against that Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/filesystems/vfs.txt3
-rw-r--r--Documentation/spi/spi-summary6
2 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
index deeeed0faa8..f49eecf2e57 100644
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
@@ -277,8 +277,7 @@ or bottom half).
unfreeze_fs: called when VFS is unlocking a filesystem and making it writable
again.
- statfs: called when the VFS needs to get filesystem statistics. This
- is called with the kernel lock held
+ statfs: called when the VFS needs to get filesystem statistics.
remount_fs: called when the filesystem is remounted. This is called
with the kernel lock held
diff --git a/Documentation/spi/spi-summary b/Documentation/spi/spi-summary
index 0f5122eb282..4a02d2508bc 100644
--- a/Documentation/spi/spi-summary
+++ b/Documentation/spi/spi-summary
@@ -511,10 +511,16 @@ SPI MASTER METHODS
This sets up the device clock rate, SPI mode, and word sizes.
Drivers may change the defaults provided by board_info, and then
call spi_setup(spi) to invoke this routine. It may sleep.
+
Unless each SPI slave has its own configuration registers, don't
change them right away ... otherwise drivers could corrupt I/O
that's in progress for other SPI devices.
+ ** BUG ALERT: for some reason the first version of
+ ** many spi_master drivers seems to get this wrong.
+ ** When you code setup(), ASSUME that the controller
+ ** is actively processing transfers for another device.
+
master->transfer(struct spi_device *spi, struct spi_message *message)
This must not sleep. Its responsibility is arrange that the
transfer happens and its complete() callback is issued. The two