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

Commit 21b4e736 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus

parents 34161db6 68380b58

Documentation/DMA-API.txt

+6 −6
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ To get this part of the dma_ API, you must #include <linux/dmapool.h> 
Many drivers need lots of small dma-coherent memory regions for DMA

descriptors or I/O buffers.  Rather than allocating in units of a page

or more using dma_alloc_coherent(), you can use DMA pools.  These work

much like a kmem_cache_t, except that they use the dma-coherent allocator

much like a struct kmem_cache, except that they use the dma-coherent allocator

not __get_free_pages().  Also, they understand common hardware constraints

for alignment, like queue heads needing to be aligned on N byte boundaries.
@@ -94,7 +94,7 @@ The pool create() routines initialize a pool of dma-coherent buffers 
for use with a given device.  It must be called in a context which

can sleep.



The "name" is for diagnostics (like a kmem_cache_t name); dev and size

The "name" is for diagnostics (like a struct kmem_cache name); dev and size

are like what you'd pass to dma_alloc_coherent().  The device's hardware

alignment requirement for this type of data is "align" (which is expressed

in bytes, and must be a power of two).  If your device has no boundary
@@ -431,10 +431,10 @@ be identical to those passed in (and returned by 
dma_alloc_noncoherent()).



int

dma_is_consistent(dma_addr_t dma_handle)

dma_is_consistent(struct device *dev, dma_addr_t dma_handle)



returns true if the memory pointed to by the dma_handle is actually

consistent.

returns true if the device dev is performing consistent DMA on the memory

area pointed to by the dma_handle.



int

dma_get_cache_alignment(void)
@@ -459,7 +459,7 @@ anything like this. You must also be extra careful about accessing 
memory you intend to sync partially.



void

dma_cache_sync(void *vaddr, size_t size,

dma_cache_sync(struct device *dev, void *vaddr, size_t size,

	       enum dma_data_direction direction)



Do a partial sync of memory that was allocated by

Documentation/DocBook/kernel-api.tmpl

+29 −3
Original line number Diff line number Diff line
@@ -418,9 +418,35 @@ X!Edrivers/pnp/system.c 
!Idrivers/parport/daisy.c

  </chapter>



  <chapter id="viddev">

     <title>Video4Linux</title>

!Edrivers/media/video/videodev.c

  <chapter id="message_devices">

	<title>Message-based devices</title>

     <sect1><title>Fusion message devices</title>

!Edrivers/message/fusion/mptbase.c

!Idrivers/message/fusion/mptbase.c

!Edrivers/message/fusion/mptscsih.c

!Idrivers/message/fusion/mptscsih.c

!Idrivers/message/fusion/mptctl.c

!Idrivers/message/fusion/mptspi.c

!Idrivers/message/fusion/mptfc.c

!Idrivers/message/fusion/mptlan.c

     </sect1>

     <sect1><title>I2O message devices</title>

!Iinclude/linux/i2o.h

!Idrivers/message/i2o/core.h

!Edrivers/message/i2o/iop.c

!Idrivers/message/i2o/iop.c

!Idrivers/message/i2o/config-osm.c

!Edrivers/message/i2o/exec-osm.c

!Idrivers/message/i2o/exec-osm.c

!Idrivers/message/i2o/bus-osm.c

!Edrivers/message/i2o/device.c

!Idrivers/message/i2o/device.c

!Idrivers/message/i2o/driver.c

!Idrivers/message/i2o/pci.c

!Idrivers/message/i2o/i2o_block.c

!Idrivers/message/i2o/i2o_scsi.c

!Idrivers/message/i2o/i2o_proc.c

     </sect1>

  </chapter>



  <chapter id="snddev">

Documentation/IPMI.txt

+33 −1
Original line number Diff line number Diff line
@@ -365,6 +365,7 @@ You can change this at module load time (for a module) with: 
       regshifts=<shift1>,<shift2>,...

       slave_addrs=<addr1>,<addr2>,...

       force_kipmid=<enable1>,<enable2>,...

       unload_when_empty=[0|1]



Each of these except si_trydefaults is a list, the first item for the

first interface, second item for the second interface, etc.
@@ -416,6 +417,11 @@ by the driver, but systems with broken interrupts might need an enable, 
or users that don't want the daemon (don't need the performance, don't

want the CPU hit) can disable it.



If unload_when_empty is set to 1, the driver will be unloaded if it

doesn't find any interfaces or all the interfaces fail to work.  The

default is one.  Setting to 0 is useful with the hotmod, but is

obviously only useful for modules.



When compiled into the kernel, the parameters can be specified on the

kernel command line as:
@@ -441,6 +447,25 @@ have high-res timers enabled in the kernel and you don't have 
interrupts enabled, the driver will run VERY slowly.  Don't blame me,

these interfaces suck.



The driver supports a hot add and remove of interfaces.  This way,

interfaces can be added or removed after the kernel is up and running.

This is done using /sys/modules/ipmi_si/hotmod, which is a write-only

parameter.  You write a string to this interface.  The string has the

format:

   <op1>[:op2[:op3...]]

The "op"s are:

   add|remove,kcs|bt|smic,mem|i/o,<address>[,<opt1>[,<opt2>[,...]]]

You can specify more than one interface on the line.  The "opt"s are:

   rsp=<regspacing>

   rsi=<regsize>

   rsh=<regshift>

   irq=<irq>

   ipmb=<ipmb slave addr>

and these have the same meanings as discussed above.  Note that you

can also use this on the kernel command line for a more compact format

for specifying an interface.  Note that when removing an interface,

only the first three parameters (si type, address type, and address)

are used for the comparison.  Any options are ignored for removing.



The SMBus Driver

----------------
@@ -502,7 +527,10 @@ used to control it: 


  modprobe ipmi_watchdog timeout=<t> pretimeout=<t> action=<action type>

      preaction=<preaction type> preop=<preop type> start_now=x

      nowayout=x

      nowayout=x ifnum_to_use=n



ifnum_to_use specifies which interface the watchdog timer should use.

The default is -1, which means to pick the first one registered.



The timeout is the number of seconds to the action, and the pretimeout

is the amount of seconds before the reset that the pre-timeout panic will
@@ -624,5 +652,9 @@ command line. The parameter is also available via the proc filesystem 
in /proc/sys/dev/ipmi/poweroff_powercycle.  Note that if the system

does not support power cycling, it will always do the power off.



The "ifnum_to_use" parameter specifies which interface the poweroff

code should use.  The default is -1, which means to pick the first one

registered.



Note that if you have ACPI enabled, the system will prefer using ACPI to

power off.

Documentation/block/as-iosched.txt

+4 −2
Original line number Diff line number Diff line
@@ -24,8 +24,10 @@ very similar behavior to the deadline IO scheduler. 
Selecting IO schedulers

-----------------------

To choose IO schedulers at boot time, use the argument 'elevator=deadline'.

'noop' and 'as' (the default) are also available. IO schedulers are assigned

globally at boot time only presently.

'noop', 'as' and 'cfq' (the default) are also available. IO schedulers are

assigned globally at boot time only presently. It's also possible to change

the IO scheduler for a determined device on the fly, as described in

Documentation/block/switching-sched.txt.





Anticipatory IO scheduler Policies

Documentation/devices.txt

+64 −38
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


	     Maintained by Torben Mathiasen <device@lanana.org>



		      Last revised: 15 May 2006

		      Last revised: 29 November 2006



This list is the Linux Device List, the official registry of allocated

device numbers and /dev directory nodes for the Linux operating
@@ -94,6 +94,7 @@ Your cooperation is appreciated. 
		  9 = /dev/urandom	Faster, less secure random number gen.

		 10 = /dev/aio		Asynchronous I/O notification interface

		 11 = /dev/kmsg		Writes to this come out as printk's



  1 block	RAM disk

		  0 = /dev/ram0		First RAM disk

		  1 = /dev/ram1		Second RAM disk
@@ -506,6 +507,7 @@ Your cooperation is appreciated. 
		 33 = /dev/patmgr1	Sequencer patch manager

		 34 = /dev/midi02	Third MIDI port

		 50 = /dev/midi03	Fourth MIDI port



 14 block	BIOS harddrive callback support {2.6}

		  0 = /dev/dos_hda	First BIOS harddrive whole disk

		 64 = /dev/dos_hdb	Second BIOS harddrive whole disk
@@ -527,6 +529,7 @@ Your cooperation is appreciated. 


 16 char	Non-SCSI scanners

		  0 = /dev/gs4500	Genius 4500 handheld scanner



 16 block	GoldStar CD-ROM

		  0 = /dev/gscd		GoldStar CD-ROM
@@ -548,6 +551,7 @@ Your cooperation is appreciated. 
		  0 = /dev/ttyC0	First Cyclades port

		    ...

		 31 = /dev/ttyC31	32nd Cyclades port



 19 block	"Double" compressed disk

		  0 = /dev/double0	First compressed disk

		    ...
@@ -563,6 +567,7 @@ Your cooperation is appreciated. 
		  0 = /dev/cub0		Callout device for ttyC0

		    ...

		 31 = /dev/cub31	Callout device for ttyC31



 20 block	Hitachi CD-ROM (under development)

		  0 = /dev/hitcd	Hitachi CD-ROM
@@ -639,6 +644,7 @@ Your cooperation is appreciated. 


 26 char	Quanta WinVision frame grabber {2.6}

		  0 = /dev/wvisfgrab	Quanta WinVision frame grabber



 26 block	Second Matsushita (Panasonic/SoundBlaster) CD-ROM

		  0 = /dev/sbpcd4	Panasonic CD-ROM controller 1 unit 0

		  1 = /dev/sbpcd5	Panasonic CD-ROM controller 1 unit 1
@@ -670,6 +676,7 @@ Your cooperation is appreciated. 
		 37 = /dev/nrawqft1	Unit 1, no rewind-on-close, no file marks

		 38 = /dev/nrawqft2	Unit 2, no rewind-on-close, no file marks

		 39 = /dev/nrawqft3	Unit 3, no rewind-on-close, no file marks



 27 block	Third Matsushita (Panasonic/SoundBlaster) CD-ROM

		  0 = /dev/sbpcd8	Panasonic CD-ROM controller 2 unit 0

		  1 = /dev/sbpcd9	Panasonic CD-ROM controller 2 unit 1
@@ -681,6 +688,7 @@ Your cooperation is appreciated. 
		  1 = /dev/staliomem1	Second Stallion card I/O memory

		  2 = /dev/staliomem2	Third Stallion card I/O memory

		  3 = /dev/staliomem3	Fourth Stallion card I/O memory



 28 char	Atari SLM ACSI laser printer (68k/Atari)

		  0 = /dev/slm0		First SLM laser printer

		  1 = /dev/slm1		Second SLM laser printer
@@ -690,6 +698,7 @@ Your cooperation is appreciated. 
		  1 = /dev/sbpcd13	Panasonic CD-ROM controller 3 unit 1

		  2 = /dev/sbpcd14	Panasonic CD-ROM controller 3 unit 2

		  3 = /dev/sbpcd15	Panasonic CD-ROM controller 3 unit 3



 28 block	ACSI disk (68k/Atari)

		  0 = /dev/ada		First ACSI disk whole disk

		 16 = /dev/adb		Second ACSI disk whole disk
@@ -750,6 +759,7 @@ Your cooperation is appreciated. 
 31 char	MPU-401 MIDI

		  0 = /dev/mpu401data	MPU-401 data port

		  1 = /dev/mpu401stat	MPU-401 status port



 31 block	ROM/flash memory card

		  0 = /dev/rom0		First ROM card (rw)

		      ...
@@ -818,6 +828,7 @@ Your cooperation is appreciated. 
		129 = /dev/smpte1	Second MIDI port, SMPTE timed

		130 = /dev/smpte2	Third MIDI port, SMPTE timed

		131 = /dev/smpte3	Fourth MIDI port, SMPTE timed



 35 block	Slow memory ramdisk

		  0 = /dev/slram	Slow memory ramdisk
@@ -828,6 +839,7 @@ Your cooperation is appreciated. 
		 16 = /dev/tap0		First Ethertap device

		    ...

		 31 = /dev/tap15	16th Ethertap device



 36 block	MCA ESDI hard disk

		  0 = /dev/eda		First ESDI disk whole disk

		 64 = /dev/edb		Second ESDI disk whole disk
@@ -882,6 +894,7 @@ Your cooperation is appreciated. 


 40 char	Matrox Meteor frame grabber {2.6}

		  0 = /dev/mmetfgrab	Matrox Meteor frame grabber



 40 block	Syquest EZ135 parallel port removable drive

		  0 = /dev/eza		Parallel EZ135 drive, whole disk
@@ -893,6 +906,7 @@ Your cooperation is appreciated. 


 41 char	Yet Another Micro Monitor

		  0 = /dev/yamm		Yet Another Micro Monitor



 41 block	MicroSolutions BackPack parallel port CD-ROM

		  0 = /dev/bpcd		BackPack CD-ROM
@@ -901,6 +915,7 @@ Your cooperation is appreciated. 
		the parallel port ATAPI CD-ROM driver at major number 46.



 42 char	Demo/sample use



 42 block	Demo/sample use



		This number is intended for use in sample code, as
@@ -918,6 +933,7 @@ Your cooperation is appreciated. 
		  0 = /dev/ttyI0	First virtual modem

		    ...

		 63 = /dev/ttyI63	64th virtual modem



 43 block	Network block devices

		  0 = /dev/nb0		First network block device

		  1 = /dev/nb1		Second network block device
@@ -934,6 +950,7 @@ Your cooperation is appreciated. 
		  0 = /dev/cui0		Callout device for ttyI0

		    ...

		 63 = /dev/cui63	Callout device for ttyI63



 44 block	Flash Translation Layer (FTL) filesystems

		  0 = /dev/ftla		FTL on first Memory Technology Device

		 16 = /dev/ftlb		FTL on second Memory Technology Device
@@ -958,6 +975,7 @@ Your cooperation is appreciated. 
		191 = /dev/ippp63	64th SyncPPP device



		255 = /dev/isdninfo	ISDN monitor interface



 45 block	Parallel port IDE disk devices

		  0 = /dev/pda		First parallel port IDE disk

		 16 = /dev/pdb		Second parallel port IDE disk
@@ -1044,6 +1062,7 @@ Your cooperation is appreciated. 
		  1 = /dev/dcbri1	Second DataComm card

		  2 = /dev/dcbri2	Third DataComm card

		  3 = /dev/dcbri3	Fourth DataComm card



 52 block	Mylex DAC960 PCI RAID controller; fifth controller

		  0 = /dev/rd/c4d0	First disk, whole disk

		  8 = /dev/rd/c4d1	Second disk, whole disk
@@ -1093,6 +1112,7 @@ Your cooperation is appreciated. 


 55 char	DSP56001 digital signal processor

		  0 = /dev/dsp56k	First DSP56001



 55 block	Mylex DAC960 PCI RAID controller; eighth controller

		  0 = /dev/rd/c7d0	First disk, whole disk

		  8 = /dev/rd/c7d1	Second disk, whole disk
@@ -1130,6 +1150,7 @@ Your cooperation is appreciated. 
		  0 = /dev/cup0		Callout device for ttyP0

		  1 = /dev/cup1		Callout device for ttyP1

		    ...



 58 block	Reserved for logical volume manager



 59 char	sf firewall package
@@ -1149,6 +1170,7 @@ Your cooperation is appreciated. 
		NAMING CONFLICT -- PROPOSED REVISED NAME /dev/rpda0 etc



 60-63 char	LOCAL/EXPERIMENTAL USE



 60-63 block	LOCAL/EXPERIMENTAL USE

		Allocated for local/experimental use.  For devices not

		assigned official numbers, these ranges should be
@@ -1434,7 +1456,6 @@ Your cooperation is appreciated. 
		DAC960 (see major number 48) except that the limit on

		partitions is 15.





 78 char	PAM Software's multimodem boards

		  0 = /dev/ttyM0	First PAM modem

		  1 = /dev/ttyM1	Second PAM modem
@@ -1450,7 +1471,6 @@ Your cooperation is appreciated. 
		DAC960 (see major number 48) except that the limit on

		partitions is 15.





 79 char	PAM Software's multimodem boards - alternate devices

		  0 = /dev/cum0		Callout device for ttyM0

		  1 = /dev/cum1		Callout device for ttyM1
@@ -1466,7 +1486,6 @@ Your cooperation is appreciated. 
		DAC960 (see major number 48) except that the limit on

		partitions is 15.





 80 char	Photometrics AT200 CCD camera

		  0 = /dev/at200	Photometrics AT200 CCD camera
@@ -1937,7 +1956,6 @@ Your cooperation is appreciated. 
		    ...



113 block	IBM iSeries virtual CD-ROM



		  0 = /dev/iseries/vcda	First virtual CD-ROM

		  1 = /dev/iseries/vcdb	Second virtual CD-ROM

		    ...
@@ -2059,11 +2077,12 @@ Your cooperation is appreciated. 
		    ...



119 char	VMware virtual network control

		  0 = /dev/vnet0	1st virtual network

		  1 = /dev/vnet1	2nd virtual network

		  0 = /dev/vmnet0	1st virtual network

		  1 = /dev/vmnet1	2nd virtual network

		    ...



120-127 char	LOCAL/EXPERIMENTAL USE



120-127 block	LOCAL/EXPERIMENTAL USE

		Allocated for local/experimental use.  For devices not

		assigned official numbers, these ranges should be
@@ -2075,7 +2094,6 @@ Your cooperation is appreciated. 
		nodes; instead they should be accessed through the

		/dev/ptmx cloning interface.





128 block       SCSI disk devices (128-143)

                  0 = /dev/sddy         129th SCSI disk whole disk

                 16 = /dev/sddz         130th SCSI disk whole disk
@@ -2087,7 +2105,6 @@ Your cooperation is appreciated. 
		disks (see major number 3) except that the limit on

		partitions is 15.





129 block       SCSI disk devices (144-159)

                  0 = /dev/sdeo         145th SCSI disk whole disk

                 16 = /dev/sdep         146th SCSI disk whole disk
@@ -2123,7 +2140,6 @@ Your cooperation is appreciated. 
		disks (see major number 3) except that the limit on

		partitions is 15.





132 block       SCSI disk devices (192-207)

                  0 = /dev/sdgk         193rd SCSI disk whole disk

                 16 = /dev/sdgl         194th SCSI disk whole disk
@@ -2135,7 +2151,6 @@ Your cooperation is appreciated. 
		disks (see major number 3) except that the limit on

		partitions is 15.





133 block       SCSI disk devices (208-223)

                  0 = /dev/sdha         209th SCSI disk whole disk

                 16 = /dev/sdhb         210th SCSI disk whole disk
@@ -2147,7 +2162,6 @@ Your cooperation is appreciated. 
		disks (see major number 3) except that the limit on

		partitions is 15.





134 block       SCSI disk devices (224-239)

                  0 = /dev/sdhq         225th SCSI disk whole disk

                 16 = /dev/sdhr         226th SCSI disk whole disk
@@ -2159,7 +2173,6 @@ Your cooperation is appreciated. 
		disks (see major number 3) except that the limit on

		partitions is 15.





135 block       SCSI disk devices (240-255)

                  0 = /dev/sdig         241st SCSI disk whole disk

                 16 = /dev/sdih         242nd SCSI disk whole disk
@@ -2171,7 +2184,6 @@ Your cooperation is appreciated. 
		disks (see major number 3) except that the limit on

		partitions is 15.





136-143 char	Unix98 PTY slaves

		  0 = /dev/pts/0	First Unix98 pseudo-TTY

		  1 = /dev/pts/1	Second Unix98 pesudo-TTY
@@ -2384,6 +2396,7 @@ Your cooperation is appreciated. 
		    ...



159 char	RESERVED



159 block	RESERVED



160 char	General Purpose Instrument Bus (GPIB)
@@ -2483,7 +2496,6 @@ Your cooperation is appreciated. 


171 char	Reserved for IEEE 1394 (Firewire)





172 char	Moxa Intellio serial card

		  0 = /dev/ttyMX0	First Moxa port

		  1 = /dev/ttyMX1	Second Moxa port
@@ -2543,9 +2555,6 @@ Your cooperation is appreciated. 
		 64 = /dev/usb/rio500	Diamond Rio 500

		 65 = /dev/usb/usblcd	USBLCD Interface (info@usblcd.de)

		 66 = /dev/usb/cpad0	Synaptics cPad (mouse/LCD)

		 67 = /dev/usb/adutux0	1st Ontrak ADU device

		    ...

		 76 = /dev/usb/adutux10	10th Ontrak ADU device

		 96 = /dev/usb/hiddev0	1st USB HID device

		    ...

		111 = /dev/usb/hiddev15	16th USB HID device
@@ -2558,7 +2567,7 @@ Your cooperation is appreciated. 
		132 = /dev/usb/idmouse	ID Mouse (fingerprint scanner) device

		133 = /dev/usb/sisusbvga1	First SiSUSB VGA device

		    ...

		140 = /dev/usb/sisusbvga8	Eigth SISUSB VGA device

		140 = /dev/usb/sisusbvga8	Eighth SISUSB VGA device

		144 = /dev/usb/lcd	USB LCD device

		160 = /dev/usb/legousbtower0	1st USB Legotower device

		    ...
@@ -2795,6 +2804,10 @@ Your cooperation is appreciated. 
		    ...

		 185 = /dev/ttyNX15		Hilscher netX serial port 15

		 186 = /dev/ttyJ0		JTAG1 DCC protocol based serial port emulation

		 187 = /dev/ttyUL0		Xilinx uartlite - port 0

		    ...

		 190 = /dev/ttyUL3		Xilinx uartlite - port 3

		 191 = /dev/xvc0		Xen virtual console - port 0



205 char	Low-density serial ports (alternate device)

		  0 = /dev/culu0		Callout device for ttyLU0
@@ -2832,7 +2845,6 @@ Your cooperation is appreciated. 
		 82 = /dev/cuvr0		Callout device for ttyVR0

		 83 = /dev/cuvr1		Callout device for ttyVR1





206 char	OnStream SC-x0 tape devices

		  0 = /dev/osst0		First OnStream SCSI tape, mode 0

		  1 = /dev/osst1		Second OnStream SCSI tape, mode 0
@@ -2922,7 +2934,6 @@ Your cooperation is appreciated. 
		    ...



212 char	LinuxTV.org DVB driver subsystem



		  0 = /dev/dvb/adapter0/video0    first video decoder of first card

		  1 = /dev/dvb/adapter0/audio0    first audio decoder of first card

		  2 = /dev/dvb/adapter0/sec0      (obsolete/unused)
@@ -3008,9 +3019,9 @@ Your cooperation is appreciated. 
		  2 = /dev/3270/tub2		Second 3270 terminal

		    ...



229 char	IBM iSeries virtual console

		  0 = /dev/iseries/vtty0	First console port

		  1 = /dev/iseries/vtty1	Second console port

229 char	IBM iSeries/pSeries virtual console

		  0 = /dev/hvc0			First console port

		  1 = /dev/hvc1			Second console port

		    ...



230 char	IBM iSeries virtual tape
@@ -3083,12 +3094,14 @@ Your cooperation is appreciated. 
234-239		UNASSIGNED



240-254 char	LOCAL/EXPERIMENTAL USE



240-254 block	LOCAL/EXPERIMENTAL USE

		Allocated for local/experimental use.  For devices not

		assigned official numbers, these ranges should be

		used in order to avoid conflicting with future assignments.



255 char	RESERVED



255 block	RESERVED



		This major is reserved to assist the expansion to a
@@ -3115,7 +3128,20 @@ Your cooperation is appreciated. 
257 char	Phoenix Technologies Cryptographic Services Driver

		  0 = /dev/ptlsec	Crypto Services Driver



257 block	SSFDC Flash Translation Layer filesystem

		  0 = /dev/ssfdca	First SSFDC layer

		  8 = /dev/ssfdcb	Second SSFDC layer

		 16 = /dev/ssfdcc	Third SSFDC layer

		 24 = /dev/ssfdcd	4th SSFDC layer

		 32 = /dev/ssfdce	5th SSFDC layer

		 40 = /dev/ssfdcf	6th SSFDC layer

		 48 = /dev/ssfdcg	7th SSFDC layer

		 56 = /dev/ssfdch	8th SSFDC layer



258 block	ROM/Flash read-only translation layer

		  0 = /dev/blockrom0	First ROM card's translation layer interface

		  1 = /dev/blockrom1	Second ROM card's translation layer interface

		  ...



 ****	ADDITIONAL /dev DIRECTORY ENTRIES