Commit 249d51b5 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'v2.6.29-rc4' into core/percpu 

Conflicts:
	arch/x86/mach-voyager/voyager_smp.c
	arch/x86/mm/fault.c
parents 44581a28 8e492151

.mailmap

+3 −1
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ Rudolf Marek <R.Marek@sh.cvut.cz> 
Rui Saraiva <rmps@joel.ist.utl.pt>

Sachin P Sant <ssant@in.ibm.com>

Sam Ravnborg <sam@mars.ravnborg.org>

Sascha Hauer <s.hauer@pengutronix.de>

S.Çağlar Onur <caglar@pardus.org.tr>

Simon Kelley <simon@thekelleys.org.uk>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
@@ -100,6 +101,7 @@ Tejun Heo <htejun@gmail.com> 
Thomas Graf <tgraf@suug.ch>

Tony Luck <tony.luck@intel.com>

Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

Uwe Kleine-König <ukl@pengutronix.de>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Documentation/block/queue-sysfs.txt

0 → 100644
+63 −0
Original line number Diff line number Diff line 
Queue sysfs files

=================



This text file will detail the queue files that are located in the sysfs tree

for each block device. Note that stacked devices typically do not export

any settings, since their queue merely functions are a remapping target.

These files are the ones found in the /sys/block/xxx/queue/ directory.



Files denoted with a RO postfix are readonly and the RW postfix means

read-write.



hw_sector_size (RO)

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

This is the hardware sector size of the device, in bytes.



max_hw_sectors_kb (RO)

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

This is the maximum number of kilobytes supported in a single data transfer.



max_sectors_kb (RW)

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

This is the maximum number of kilobytes that the block layer will allow

for a filesystem request. Must be smaller than or equal to the maximum

size allowed by the hardware.



nomerges (RW)

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

This enables the user to disable the lookup logic involved with IO merging

requests in the block layer. Merging may still occur through a direct

1-hit cache, since that comes for (almost) free. The IO scheduler will not

waste cycles doing tree/hash lookups for merges if nomerges is 1. Defaults

to 0, enabling all merges.



nr_requests (RW)

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

This controls how many requests may be allocated in the block layer for

read or write requests. Note that the total allocated number may be twice

this amount, since it applies only to reads or writes (not the accumulated

sum).



read_ahead_kb (RW)

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

Maximum number of kilobytes to read-ahead for filesystems on this block

device.



rq_affinity (RW)

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

If this option is enabled, the block layer will migrate request completions

to the CPU that originally submitted the request. For some workloads

this provides a significant reduction in CPU cycles due to caching effects.



scheduler (RW)

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

When read, this file will display the current and available IO schedulers

for this block device. The currently active IO scheduler will be enclosed

in [] brackets. Writing an IO scheduler name to this file will switch

control of this block device to that new IO scheduler. Note that writing

an IO scheduler name to this file will attempt to load that IO scheduler

module, if it isn't already present in the system.







Jens Axboe <jens.axboe@oracle.com>, February 2009

Documentation/cpu-freq/user-guide.txt

+0 −16
Original line number Diff line number Diff line
@@ -195,19 +195,3 @@ scaling_setspeed. By "echoing" a new frequency into this 
				you can change the speed of the CPU,

				but only within the limits of

				scaling_min_freq and scaling_max_freq.
 
				



3.2 Deprecated Interfaces

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



Depending on your kernel configuration, you might find the following 

cpufreq-related files:

/proc/cpufreq

/proc/sys/cpu/*/speed

/proc/sys/cpu/*/speed-min

/proc/sys/cpu/*/speed-max



These are files for deprecated interfaces to cpufreq, which offer far

less functionality. Because of this, these interfaces aren't described

here.

Documentation/filesystems/sysfs-pci.txt

+12 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ that support it. For example, a given bus might look like this: 
     |   |-- class

     |   |-- config

     |   |-- device

     |   |-- enable

     |   |-- irq

     |   |-- local_cpus

     |   |-- resource
@@ -32,6 +33,7 @@ files, each with their own function. 
       class		   PCI class (ascii, ro)

       config		   PCI config space (binary, rw)

       device		   PCI device (ascii, ro)

       enable	           Whether the device is enabled (ascii, rw)

       irq		   IRQ number (ascii, ro)

       local_cpus	   nearby CPU mask (cpumask, ro)

       resource		   PCI resource host addresses (ascii, ro)
@@ -57,10 +59,19 @@ used to do actual device programming from userspace. Note that some platforms 
don't support mmapping of certain resources, so be sure to check the return

value from any attempted mmap.



The 'enable' file provides a counter that indicates how many times the device 

has been enabled.  If the 'enable' file currently returns '4', and a '1' is

echoed into it, it will then return '5'.  Echoing a '0' into it will decrease

the count.  Even when it returns to 0, though, some of the initialisation

may not be reversed.  



The 'rom' file is special in that it provides read-only access to the device's

ROM file, if available.  It's disabled by default, however, so applications

should write the string "1" to the file to enable it before attempting a read

call, and disable it following the access by writing "0" to the file.

call, and disable it following the access by writing "0" to the file.  Note

that the device must be enabled for a rom read to return data succesfully.

In the event a driver is not bound to the device, it can be enabled using the

'enable' file, documented above.



Accessing legacy resources through sysfs

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

Documentation/filesystems/ubifs.txt

+0 −7
Original line number Diff line number Diff line
@@ -79,13 +79,6 @@ Mount options 


(*) == default.



norm_unmount (*)	commit on unmount; the journal is committed

			when the file-system is unmounted so that the

			next mount does not have to replay the journal

			and it becomes very fast;

fast_unmount		do not commit on unmount; this option makes

			unmount faster, but the next mount slower

			because of the need to replay the journal.

bulk_read		read more in one go to take advantage of flash

			media that read faster sequentially

no_bulk_read (*)	do not bulk-read

CRA Git | Maintained and supported by SUSTech CRA and CCSE