diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-02 14:09:50 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-02 14:09:50 -0500 |
commit | a64d31baed104be25305e9c71585d3ea4ee9a418 (patch) | |
tree | 470e3c59ef39f38bcd69f8fef7dba8f76afbec53 /Documentation | |
parent | 1c39194878c09bd88ffc9c9d4c2f01c3397c7aed (diff) | |
parent | 061e41fdb5047b1fb161e89664057835935ca1d2 (diff) |
Merge branch 'linus' into cpus4096
Conflicts:
kernel/trace/ring_buffer.c
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/DMA-API.txt | 8 | ||||
-rw-r--r-- | Documentation/cpu-freq/user-guide.txt | 12 | ||||
-rw-r--r-- | Documentation/filesystems/ocfs2.txt | 3 | ||||
-rw-r--r-- | Documentation/filesystems/proc.txt | 27 | ||||
-rw-r--r-- | Documentation/filesystems/ramfs-rootfs-initramfs.txt | 12 | ||||
-rw-r--r-- | Documentation/input/input-programming.txt | 3 | ||||
-rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 5 | ||||
-rw-r--r-- | Documentation/spi/spi-summary | 2 |
8 files changed, 55 insertions, 17 deletions
diff --git a/Documentation/DMA-API.txt b/Documentation/DMA-API.txt index b8e86460046..b462bb14954 100644 --- a/Documentation/DMA-API.txt +++ b/Documentation/DMA-API.txt | |||
@@ -316,12 +316,10 @@ reduce current DMA mapping usage or delay and try again later). | |||
316 | pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg, | 316 | pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg, |
317 | int nents, int direction) | 317 | int nents, int direction) |
318 | 318 | ||
319 | Maps a scatter gather list from the block layer. | ||
320 | |||
321 | Returns: the number of physical segments mapped (this may be shorter | 319 | Returns: the number of physical segments mapped (this may be shorter |
322 | than <nents> passed in if the block layer determines that some | 320 | than <nents> passed in if some elements of the scatter/gather list are |
323 | elements of the scatter/gather list are physically adjacent and thus | 321 | physically or virtually adjacent and an IOMMU maps them with a single |
324 | may be mapped with a single entry). | 322 | entry). |
325 | 323 | ||
326 | Please note that the sg cannot be mapped again if it has been mapped once. | 324 | Please note that the sg cannot be mapped again if it has been mapped once. |
327 | The mapping process is allowed to destroy information in the sg. | 325 | The mapping process is allowed to destroy information in the sg. |
diff --git a/Documentation/cpu-freq/user-guide.txt b/Documentation/cpu-freq/user-guide.txt index 6c442d8426b..4f3f3840320 100644 --- a/Documentation/cpu-freq/user-guide.txt +++ b/Documentation/cpu-freq/user-guide.txt | |||
@@ -23,6 +23,7 @@ Contents: | |||
23 | 1.3 sparc64 | 23 | 1.3 sparc64 |
24 | 1.4 ppc | 24 | 1.4 ppc |
25 | 1.5 SuperH | 25 | 1.5 SuperH |
26 | 1.6 Blackfin | ||
26 | 27 | ||
27 | 2. "Policy" / "Governor"? | 28 | 2. "Policy" / "Governor"? |
28 | 2.1 Policy | 29 | 2.1 Policy |
@@ -97,6 +98,17 @@ The following SuperH processors are supported by cpufreq: | |||
97 | SH-3 | 98 | SH-3 |
98 | SH-4 | 99 | SH-4 |
99 | 100 | ||
101 | 1.6 Blackfin | ||
102 | ------------ | ||
103 | |||
104 | The following Blackfin processors are supported by cpufreq: | ||
105 | |||
106 | BF522, BF523, BF524, BF525, BF526, BF527, Rev 0.1 or higher | ||
107 | BF531, BF532, BF533, Rev 0.3 or higher | ||
108 | BF534, BF536, BF537, Rev 0.2 or higher | ||
109 | BF561, Rev 0.3 or higher | ||
110 | BF542, BF544, BF547, BF548, BF549, Rev 0.1 or higher | ||
111 | |||
100 | 112 | ||
101 | 2. "Policy" / "Governor" ? | 113 | 2. "Policy" / "Governor" ? |
102 | ========================== | 114 | ========================== |
diff --git a/Documentation/filesystems/ocfs2.txt b/Documentation/filesystems/ocfs2.txt index 4340cc82579..67310fbbb7d 100644 --- a/Documentation/filesystems/ocfs2.txt +++ b/Documentation/filesystems/ocfs2.txt | |||
@@ -28,10 +28,7 @@ Manish Singh <manish.singh@oracle.com> | |||
28 | Caveats | 28 | Caveats |
29 | ======= | 29 | ======= |
30 | Features which OCFS2 does not support yet: | 30 | Features which OCFS2 does not support yet: |
31 | - extended attributes | ||
32 | - quotas | 31 | - quotas |
33 | - cluster aware flock | ||
34 | - cluster aware lockf | ||
35 | - Directory change notification (F_NOTIFY) | 32 | - Directory change notification (F_NOTIFY) |
36 | - Distributed Caching (F_SETLEASE/F_GETLEASE/break_lease) | 33 | - Distributed Caching (F_SETLEASE/F_GETLEASE/break_lease) |
37 | - POSIX ACLs | 34 | - POSIX ACLs |
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index bcceb99b81d..bb1b0dd3bfc 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt | |||
@@ -44,6 +44,7 @@ Table of Contents | |||
44 | 2.14 /proc/<pid>/io - Display the IO accounting fields | 44 | 2.14 /proc/<pid>/io - Display the IO accounting fields |
45 | 2.15 /proc/<pid>/coredump_filter - Core dump filtering settings | 45 | 2.15 /proc/<pid>/coredump_filter - Core dump filtering settings |
46 | 2.16 /proc/<pid>/mountinfo - Information about mounts | 46 | 2.16 /proc/<pid>/mountinfo - Information about mounts |
47 | 2.17 /proc/sys/fs/epoll - Configuration options for the epoll interface | ||
47 | 48 | ||
48 | ------------------------------------------------------------------------------ | 49 | ------------------------------------------------------------------------------ |
49 | Preface | 50 | Preface |
@@ -2483,4 +2484,30 @@ For more information on mount propagation see: | |||
2483 | 2484 | ||
2484 | Documentation/filesystems/sharedsubtree.txt | 2485 | Documentation/filesystems/sharedsubtree.txt |
2485 | 2486 | ||
2487 | 2.17 /proc/sys/fs/epoll - Configuration options for the epoll interface | ||
2488 | -------------------------------------------------------- | ||
2489 | |||
2490 | This directory contains configuration options for the epoll(7) interface. | ||
2491 | |||
2492 | max_user_instances | ||
2493 | ------------------ | ||
2494 | |||
2495 | This is the maximum number of epoll file descriptors that a single user can | ||
2496 | have open at a given time. The default value is 128, and should be enough | ||
2497 | for normal users. | ||
2498 | |||
2499 | max_user_watches | ||
2500 | ---------------- | ||
2501 | |||
2502 | Every epoll file descriptor can store a number of files to be monitored | ||
2503 | for event readiness. Each one of these monitored files constitutes a "watch". | ||
2504 | This configuration option sets the maximum number of "watches" that are | ||
2505 | allowed for each user. | ||
2506 | Each "watch" costs roughly 90 bytes on a 32bit kernel, and roughly 160 bytes | ||
2507 | on a 64bit one. | ||
2508 | The current default value for max_user_watches is the 1/32 of the available | ||
2509 | low memory, divided for the "watch" cost in bytes. | ||
2510 | |||
2511 | |||
2486 | ------------------------------------------------------------------------------ | 2512 | ------------------------------------------------------------------------------ |
2513 | |||
diff --git a/Documentation/filesystems/ramfs-rootfs-initramfs.txt b/Documentation/filesystems/ramfs-rootfs-initramfs.txt index 62fe9b1e089..a8273d5fad2 100644 --- a/Documentation/filesystems/ramfs-rootfs-initramfs.txt +++ b/Documentation/filesystems/ramfs-rootfs-initramfs.txt | |||
@@ -130,12 +130,12 @@ The 2.6 kernel build process always creates a gzipped cpio format initramfs | |||
130 | archive and links it into the resulting kernel binary. By default, this | 130 | archive and links it into the resulting kernel binary. By default, this |
131 | archive is empty (consuming 134 bytes on x86). | 131 | archive is empty (consuming 134 bytes on x86). |
132 | 132 | ||
133 | The config option CONFIG_INITRAMFS_SOURCE (for some reason buried under | 133 | The config option CONFIG_INITRAMFS_SOURCE (in General Setup in menuconfig, |
134 | devices->block devices in menuconfig, and living in usr/Kconfig) can be used | 134 | and living in usr/Kconfig) can be used to specify a source for the |
135 | to specify a source for the initramfs archive, which will automatically be | 135 | initramfs archive, which will automatically be incorporated into the |
136 | incorporated into the resulting binary. This option can point to an existing | 136 | resulting binary. This option can point to an existing gzipped cpio |
137 | gzipped cpio archive, a directory containing files to be archived, or a text | 137 | archive, a directory containing files to be archived, or a text file |
138 | file specification such as the following example: | 138 | specification such as the following example: |
139 | 139 | ||
140 | dir /dev 755 0 0 | 140 | dir /dev 755 0 0 |
141 | nod /dev/console 644 0 0 c 5 1 | 141 | nod /dev/console 644 0 0 c 5 1 |
diff --git a/Documentation/input/input-programming.txt b/Documentation/input/input-programming.txt index 81905e81585..7f8b9d97bc4 100644 --- a/Documentation/input/input-programming.txt +++ b/Documentation/input/input-programming.txt | |||
@@ -20,10 +20,11 @@ pressed or released a BUTTON_IRQ happens. The driver could look like: | |||
20 | 20 | ||
21 | static struct input_dev *button_dev; | 21 | static struct input_dev *button_dev; |
22 | 22 | ||
23 | static void button_interrupt(int irq, void *dummy, struct pt_regs *fp) | 23 | static irqreturn_t button_interrupt(int irq, void *dummy) |
24 | { | 24 | { |
25 | input_report_key(button_dev, BTN_0, inb(BUTTON_PORT) & 1); | 25 | input_report_key(button_dev, BTN_0, inb(BUTTON_PORT) & 1); |
26 | input_sync(button_dev); | 26 | input_sync(button_dev); |
27 | return IRQ_HANDLED; | ||
27 | } | 28 | } |
28 | 29 | ||
29 | static int __init button_init(void) | 30 | static int __init button_init(void) |
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index e0e54a27fc1..3cd2ad95817 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
@@ -1072,10 +1072,13 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
1072 | ref Reference board | 1072 | ref Reference board |
1073 | dell-m4-1 Dell desktops | 1073 | dell-m4-1 Dell desktops |
1074 | dell-m4-2 Dell desktops | 1074 | dell-m4-2 Dell desktops |
1075 | dell-m4-3 Dell desktops | ||
1075 | 1076 | ||
1076 | STAC92HD73* | 1077 | STAC92HD73* |
1077 | ref Reference board | 1078 | ref Reference board |
1078 | dell-m6 Dell desktops | 1079 | dell-m6-amic Dell desktops/laptops with analog mics |
1080 | dell-m6-dmic Dell desktops/laptops with digital mics | ||
1081 | dell-m6 Dell desktops/laptops with both type of mics | ||
1079 | 1082 | ||
1080 | STAC9872 | 1083 | STAC9872 |
1081 | vaio Setup for VAIO FE550G/SZ110 | 1084 | vaio Setup for VAIO FE550G/SZ110 |
diff --git a/Documentation/spi/spi-summary b/Documentation/spi/spi-summary index 8bae2f018d3..0f5122eb282 100644 --- a/Documentation/spi/spi-summary +++ b/Documentation/spi/spi-summary | |||
@@ -215,7 +215,7 @@ So for example arch/.../mach-*/board-*.c files might have code like: | |||
215 | /* if your mach-* infrastructure doesn't support kernels that can | 215 | /* if your mach-* infrastructure doesn't support kernels that can |
216 | * run on multiple boards, pdata wouldn't benefit from "__init". | 216 | * run on multiple boards, pdata wouldn't benefit from "__init". |
217 | */ | 217 | */ |
218 | static struct mysoc_spi_data __init pdata = { ... }; | 218 | static struct mysoc_spi_data __initdata pdata = { ... }; |
219 | 219 | ||
220 | static __init board_init(void) | 220 | static __init board_init(void) |
221 | { | 221 | { |