Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 189660
b: refs/heads/master
c: 84fba5e
h: refs/heads/master
v: v3
  • Loading branch information
Anton Blanchard authored and Ingo Molnar committed Apr 6, 2010
1 parent 048b2e0 commit 237984c
Show file tree
Hide file tree
Showing 4,338 changed files with 1,860 additions and 19,545 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: cf90bfe2ebaf9d32f37acbebb7425c280fd6cd30
refs/heads/master: 84fba5ec91f11c0efb27d0ed6098f7447491f0df
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.

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
5 changes: 3 additions & 2 deletions trunk/Documentation/watchdog/watchdog-api.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,10 +222,11 @@ returned value is the temperature in degrees fahrenheit.
ioctl(fd, WDIOC_GETTEMP, &temperature);

Finally the SETOPTIONS ioctl can be used to control some aspects of
the cards operation.
the cards operation; right now the pcwd driver is the only one
supporting this ioctl.

int options = 0;
ioctl(fd, WDIOC_SETOPTIONS, &options);
ioctl(fd, WDIOC_SETOPTIONS, options);

The following options are available:

Expand Down
13 changes: 6 additions & 7 deletions trunk/MAINTAINERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2474,6 +2474,12 @@ L: linuxppc-dev@ozlabs.org
S: Odd Fixes
F: drivers/char/hvc_*

VIRTIO CONSOLE DRIVER
M: Amit Shah <amit.shah@redhat.com>
L: virtualization@lists.linux-foundation.org
S: Maintained
F: drivers/char/virtio_console.c

iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
M: Peter Jones <pjones@redhat.com>
M: Konrad Rzeszutek Wilk <konrad@kernel.org>
Expand Down Expand Up @@ -5965,13 +5971,6 @@ S: Maintained
F: Documentation/filesystems/vfat.txt
F: fs/fat/

VIRTIO CONSOLE DRIVER
M: Amit Shah <amit.shah@redhat.com>
L: virtualization@lists.linux-foundation.org
S: Maintained
F: drivers/char/virtio_console.c
F: include/linux/virtio_console.h

VIRTIO HOST (VHOST)
M: "Michael S. Tsirkin" <mst@redhat.com>
L: kvm@vger.kernel.org
Expand Down
1 change: 0 additions & 1 deletion trunk/arch/alpha/boot/bootp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
* based significantly on the arch/alpha/boot/main.c of Linus Torvalds
*/
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/string.h>
#include <generated/utsrelease.h>
#include <linux/mm.h>
Expand Down
1 change: 0 additions & 1 deletion trunk/arch/alpha/boot/bootpz.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
* and the decompression code from MILO.
*/
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/string.h>
#include <generated/utsrelease.h>
#include <linux/mm.h>
Expand Down
1 change: 0 additions & 1 deletion trunk/arch/alpha/boot/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
* This file is the bootloader for the Linux/AXP kernel
*/
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/string.h>
#include <generated/utsrelease.h>
#include <linux/mm.h>
Expand Down
1 change: 0 additions & 1 deletion trunk/arch/alpha/boot/misc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
*/

#include <linux/kernel.h>
#include <linux/slab.h>

#include <asm/uaccess.h>

Expand Down
1 change: 1 addition & 0 deletions trunk/arch/alpha/kernel/irq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <linux/sched.h>
#include <linux/ptrace.h>
#include <linux/interrupt.h>
#include <linux/slab.h>
#include <linux/random.h>
#include <linux/init.h>
#include <linux/irq.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/alpha/kernel/osf_sys.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <linux/syscalls.h>
#include <linux/unistd.h>
#include <linux/ptrace.h>
#include <linux/slab.h>
#include <linux/user.h>
#include <linux/utsname.h>
#include <linux/time.h>
Expand All @@ -36,7 +37,6 @@
#include <linux/uio.h>
#include <linux/vfs.h>
#include <linux/rcupdate.h>
#include <linux/slab.h>

#include <asm/fpu.h>
#include <asm/io.h>
Expand Down
1 change: 0 additions & 1 deletion trunk/arch/alpha/kernel/pci-noop.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/bootmem.h>
#include <linux/gfp.h>
#include <linux/capability.h>
#include <linux/mm.h>
#include <linux/errno.h>
Expand Down
Loading

0 comments on commit 237984c

Please sign in to comment.