Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4366889 authored by Dave Jones's avatar Dave Jones
Browse files

Merge ../linus

Conflicts:

	drivers/cpufreq/cpufreq.c
parents db2fb9db e1036502
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@
# Top-level generic files
#
tags
TAGS
vmlinux*
System.map
Module.symvers
+14 −5
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ S: Longford, Ireland
S: Sydney, Australia

N: Tigran A. Aivazian
E: tigran@veritas.com
E: tigran@aivazian.fsnet.co.uk
W: http://www.moses.uklinux.net/patches
D: BFS filesystem
D: Intel IA32 CPU microcode update support
@@ -1808,6 +1808,14 @@ S: Kruislaan 419
S: 1098 VA Amsterdam 
S: The Netherlands

N: Jiri Kosina
E: jikos@jikos.cz
E: jkosina@suse.cz
D: Generic HID layer - original code split, fixes
D: Various ACPI fixes, keeping correct battery state through suspend
D: various lockdep annotations, autofs and other random bugfixes
S: Prague, Czech Republic

N: Gene Kozin
E: 74604.152@compuserve.com
W: http://www.sangoma.com
@@ -2598,6 +2606,9 @@ S: Ucitelska 1576
S: Prague 8
S: 182 00 Czech Republic

N: Rick Payne
D: RFC2385 Support for TCP

N: Barak A. Pearlmutter
E: bap@cs.unm.edu
W: http://www.cs.unm.edu/~bap/
@@ -3511,14 +3522,12 @@ D: The Linux Support Team Erlangen

N: David Weinehall
E: tao@acc.umu.se
P: 1024D/DC47CA16 7ACE 0FB0 7A74 F994 9B36  E1D1 D14E 8526 DC47 CA16
W: http://www.acc.umu.se/~tao/
W: http://www.acc.umu.se/~mcalinux/
D: v2.0 kernel maintainer
D: Fixes for the NE/2-driver
D: Miscellaneous MCA-support
D: Cleanup of the Config-files
S: Axtorpsvagen 40:20
S: S-903 37  UMEA
S: Sweden

N: Matt Welsh
E: mdw@metalab.unc.edu
+0 −2
Original line number Diff line number Diff line
@@ -104,8 +104,6 @@ firmware_class/
	- request_firmware() hotplug interface info.
floppy.txt
	- notes and driver options for the floppy disk driver.
ftape.txt
	- notes about the floppy tape device driver.
hayes-esp.txt
	- info on using the Hayes ESP serial driver.
highuid.txt
+20 −0
Original line number Diff line number Diff line
What:           /debug/pktcdvd/pktcdvd[0-7]
Date:           Oct. 2006
KernelVersion:  2.6.19
Contact:        Thomas Maier <balagi@justmail.de>
Description:

debugfs interface
-----------------

The pktcdvd module (packet writing driver) creates
these files in debugfs:

/debug/pktcdvd/pktcdvd[0-7]/
    info            (0444) Lots of human readable driver
                           statistics and infos. Multiple lines!

Example:
-------

cat /debug/pktcdvd/pktcdvd0/info
+72 −0
Original line number Diff line number Diff line
What:           /sys/class/pktcdvd/
Date:           Oct. 2006
KernelVersion:  2.6.19
Contact:        Thomas Maier <balagi@justmail.de>
Description:

sysfs interface
---------------

The pktcdvd module (packet writing driver) creates
these files in the sysfs:
(<devid> is in format  major:minor )

/sys/class/pktcdvd/
    add            (0200)  Write a block device id (major:minor)
                           to create a new pktcdvd device and map
                           it to the block device.

    remove         (0200)  Write the pktcdvd device id (major:minor)
                           to it to remove the pktcdvd device.

    device_map     (0444)  Shows the device mapping in format:
                             pktcdvd[0-7] <pktdevid> <blkdevid>

/sys/class/pktcdvd/pktcdvd[0-7]/
    dev                   (0444) Device id
    uevent                (0200) To send an uevent.

/sys/class/pktcdvd/pktcdvd[0-7]/stat/
    packets_started       (0444) Number of started packets.
    packets_finished      (0444) Number of finished packets.

    kb_written            (0444) kBytes written.
    kb_read               (0444) kBytes read.
    kb_read_gather        (0444) kBytes read to fill write packets.

    reset                 (0200) Write any value to it to reset
                                 pktcdvd device statistic values, like
                                 bytes read/written.

/sys/class/pktcdvd/pktcdvd[0-7]/write_queue/
    size                  (0444) Contains the size of the bio write
                                 queue.

    congestion_off        (0644) If bio write queue size is below
                                 this mark, accept new bio requests
                                 from the block layer.

    congestion_on         (0644) If bio write queue size is higher
                                 as this mark, do no longer accept
                                 bio write requests from the block
                                 layer and wait till the pktcdvd
                                 device has processed enough bio's
                                 so that bio write queue size is
                                 below congestion off mark.
                                 A value of <= 0 disables congestion
                                 control.


Example:
--------
To use the pktcdvd sysfs interface directly, you can do:

# create a new pktcdvd device mapped to /dev/hdc
echo "22:0" >/sys/class/pktcdvd/add
cat /sys/class/pktcdvd/device_map
# assuming device pktcdvd0 was created, look at stat's
cat /sys/class/pktcdvd/pktcdvd0/stat/kb_written
# print the device id of the mapped block device
fgrep pktcdvd0 /sys/class/pktcdvd/device_map
# remove device, using pktcdvd0 device id   253:0
echo "253:0" >/sys/class/pktcdvd/remove
Loading