Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 189758
b: refs/heads/master
c: bade732
h: refs/heads/master
v: v3
  • Loading branch information
Tom Tucker authored and J. Bruce Fields committed Apr 5, 2010
1 parent e4da3e7 commit 0793518
Show file tree
Hide file tree
Showing 4,521 changed files with 4,961 additions and 25,122 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 44fa2b4bee5b07d506a7b002b4e2eb73654db7e0
refs/heads/master: bade732a2848e640482c1e99629a90e085d574dd
13 changes: 0 additions & 13 deletions trunk/Documentation/DocBook/tracepoint.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,6 @@
</address>
</affiliation>
</author>
<author>
<firstname>William</firstname>
<surname>Cohen</surname>
<affiliation>
<address>
<email>wcohen@redhat.com</email>
</address>
</affiliation>
</author>
</authorgroup>

<legalnotice>
Expand Down Expand Up @@ -100,8 +91,4 @@
!Iinclude/trace/events/signal.h
</chapter>

<chapter id="block">
<title>Block IO</title>
!Iinclude/trace/events/block.h
</chapter>
</book>
4 changes: 2 additions & 2 deletions trunk/Documentation/block/biodoc.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1162,8 +1162,8 @@ where a driver received a request ala this before:

As mentioned, there is no virtual mapping of a bio. For DMA, this is
not a problem as the driver probably never will need a virtual mapping.
Instead it needs a bus mapping (dma_map_page for a single segment or
use dma_map_sg for scatter gather) to be able to ship it to the driver. For
Instead it needs a bus mapping (pci_map_page for a single segment or
use blk_rq_map_sg for scatter gather) to be able to ship it to the driver. For
PIO drivers (or drivers that need to revert to PIO transfer once in a
while (IDE for example)), where the CPU is doing the actual data
transfer a virtual mapping is needed. If the driver supports highmem I/O,
Expand Down
1 change: 0 additions & 1 deletion trunk/Documentation/connector/cn_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/skbuff.h>
#include <linux/slab.h>
#include <linux/timer.h>

#include <linux/connector.h>
Expand Down
14 changes: 7 additions & 7 deletions trunk/Documentation/fb/efifb.txt → trunk/Documentation/fb/imacfb.txt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

What is efifb?
What is imacfb?
===============

This is a generic EFI platform driver for Intel based Apple computers.
efifb is only for EFI booted Intel Macs.
Imacfb is only for EFI booted Intel Macs.

Supported Hardware
==================
Expand All @@ -16,16 +16,16 @@ MacMini
How to use it?
==============

efifb does not have any kind of autodetection of your machine.
Imacfb does not have any kind of autodetection of your machine.
You have to add the following kernel parameters in your elilo.conf:
Macbook :
video=efifb:macbook
video=imacfb:macbook
MacMini :
video=efifb:mini
video=imacfb:mini
Macbook Pro 15", iMac 17" :
video=efifb:i17
video=imacfb:i17
Macbook Pro 17", iMac 20" :
video=efifb:i20
video=imacfb:i20

--
Edgar Hucek <gimli@dark-green.com>
18 changes: 2 additions & 16 deletions trunk/Documentation/filesystems/9p.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,6 @@ For Plan 9 From User Space applications (http://swtch.com/plan9)

mount -t 9p `namespace`/acme /mnt/9 -o trans=unix,uname=$USER

For server running on QEMU host with virtio transport:

mount -t 9p -o trans=virtio <mount_tag> /mnt/9

where mount_tag is the tag associated by the server to each of the exported
mount points. Each 9P export is seen by the client as a virtio device with an
associated "mount_tag" property. Available mount tags can be
seen by reading /sys/bus/virtio/drivers/9pnet_virtio/virtio<n>/mount_tag files.

OPTIONS
=======

Expand All @@ -56,7 +47,7 @@ OPTIONS
fd - used passed file descriptors for connection
(see rfdno and wfdno)
virtio - connect to the next virtio channel available
(from QEMU with trans_virtio module)
(from lguest or KVM with trans_virtio module)
rdma - connect to a specified RDMA channel

uname=name user name to attempt mount as on the remote server. The
Expand Down Expand Up @@ -94,12 +85,7 @@ OPTIONS

port=n port to connect to on the remote server

noextend force legacy mode (no 9p2000.u or 9p2000.L semantics)

version=name Select 9P protocol version. Valid options are:
9p2000 - Legacy mode (same as noextend)
9p2000.u - Use 9P2000.u protocol
9p2000.L - Use 9P2000.L protocol
noextend force legacy mode (no 9p2000.u semantics)

dfltuid attempt to mount as a particular uid

Expand Down
143 changes: 0 additions & 143 deletions trunk/Documentation/networking/stmmac.txt
View file

This file was deleted.

54 changes: 0 additions & 54 deletions trunk/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,6 @@ Required properties:
- fsl,qe-num-snums: define how many serial number(SNUM) the QE can use for the
threads.

Optional properties:
- fsl,firmware-phandle:
Usage: required only if there is no fsl,qe-firmware child node
Value type: <phandle>
Definition: Points to a firmware node (see "QE Firmware Node" below)
that contains the firmware that should be uploaded for this QE.
The compatible property for the firmware node should say,
"fsl,qe-firmware".

Recommended properties
- brg-frequency : the internal clock source frequency for baud-rate
generators in Hz.
Expand Down Expand Up @@ -68,48 +59,3 @@ Example:
reg = <0 c000>;
};
};

* QE Firmware Node

This node defines a firmware binary that is embedded in the device tree, for
the purpose of passing the firmware from bootloader to the kernel, or from
the hypervisor to the guest.

The firmware node itself contains the firmware binary contents, a compatible
property, and any firmware-specific properties. The node should be placed
inside a QE node that needs it. Doing so eliminates the need for a
fsl,firmware-phandle property. Other QE nodes that need the same firmware
should define an fsl,firmware-phandle property that points to the firmware node
in the first QE node.

The fsl,firmware property can be specified in the DTS (possibly using incbin)
or can be inserted by the boot loader at boot time.

Required properties:
- compatible
Usage: required
Value type: <string>
Definition: A standard property. Specify a string that indicates what
kind of firmware it is. For QE, this should be "fsl,qe-firmware".

- fsl,firmware
Usage: required
Value type: <prop-encoded-array>, encoded as an array of bytes
Definition: A standard property. This property contains the firmware
binary "blob".

Example:
qe1@e0080000 {
compatible = "fsl,qe";
qe_firmware:qe-firmware {
compatible = "fsl,qe-firmware";
fsl,firmware = [0x70 0xcd 0x00 0x00 0x01 0x46 0x45 ...];
};
...
};

qe2@e0090000 {
compatible = "fsl,qe";
fsl,firmware-phandle = <&qe_firmware>;
...
};
16 changes: 4 additions & 12 deletions trunk/Documentation/sound/alsa/HD-Audio.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,18 +119,10 @@ the codec slots 0 and 1 no matter what the hardware reports.

Interrupt Handling
~~~~~~~~~~~~~~~~~~
HD-audio driver uses MSI as default (if available) since 2.6.33
kernel as MSI works better on some machines, and in general, it's
better for performance. However, Nvidia controllers showed bad
regressions with MSI (especially in a combination with AMD chipset),
thus we disabled MSI for them.

There seem also still other devices that don't work with MSI. If you
see a regression wrt the sound quality (stuttering, etc) or a lock-up
in the recent kernel, try to pass `enable_msi=0` option to disable
MSI. If it works, you can add the known bad device to the blacklist
defined in hda_intel.c. In such a case, please report and give the
patch back to the upstream developer.
In rare but some cases, the interrupt isn't properly handled as
default. You would notice this by the DMA transfer error reported by
ALSA PCM core, for example. Using MSI might help in such a case.
Pass `enable_msi=1` option for enabling MSI.


HD-AUDIO CODEC
Expand Down
3 changes: 3 additions & 0 deletions trunk/Documentation/watchdog/src/watchdog-simple.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ int main(void)
ret = -1;
break;
}
ret = fsync(fd);
if (ret)
break;
sleep(10);
}
close(fd);
Expand Down
8 changes: 2 additions & 6 deletions trunk/Documentation/watchdog/src/watchdog-test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ static void keep_alive(void)
*/
int main(int argc, char *argv[])
{
int flags;

fd = open("/dev/watchdog", O_WRONLY);

if (fd == -1) {
Expand All @@ -43,14 +41,12 @@ int main(int argc, char *argv[])

if (argc > 1) {
if (!strncasecmp(argv[1], "-d", 2)) {
flags = WDIOS_DISABLECARD;
ioctl(fd, WDIOC_SETOPTIONS, &flags);
ioctl(fd, WDIOC_SETOPTIONS, WDIOS_DISABLECARD);
fprintf(stderr, "Watchdog card disabled.\n");
fflush(stderr);
exit(0);
} else if (!strncasecmp(argv[1], "-e", 2)) {
flags = WDIOS_ENABLECARD;
ioctl(fd, WDIOC_SETOPTIONS, &flags);
ioctl(fd, WDIOC_SETOPTIONS, WDIOS_ENABLECARD);
fprintf(stderr, "Watchdog card enabled.\n");
fflush(stderr);
exit(0);
Expand Down
Loading

0 comments on commit 0793518

Please sign in to comment.