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

Commit c1dfdc75 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'v2.6.28-rc8' into sched/core

parents efbe027e 8b1fae4e

Documentation/DMA-API.txt

+3 −5
Original line number Diff line number Diff line
@@ -316,12 +316,10 @@ reduce current DMA mapping usage or delay and try again later). 
	pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg,

		int nents, int direction)



Maps a scatter gather list from the block layer.



Returns: the number of physical segments mapped (this may be shorter

than <nents> passed in if the block layer determines that some

elements of the scatter/gather list are physically adjacent and thus

may be mapped with a single entry).

than <nents> passed in if some elements of the scatter/gather list are

physically or virtually adjacent and an IOMMU maps them with a single

entry).



Please note that the sg cannot be mapped again if it has been mapped once.

The mapping process is allowed to destroy information in the sg.

Documentation/filesystems/ocfs2.txt

+0 −3
Original line number Diff line number Diff line
@@ -28,10 +28,7 @@ Manish Singh <manish.singh@oracle.com> 
Caveats

=======

Features which OCFS2 does not support yet:

	- extended attributes

	- quotas

	- cluster aware flock

	- cluster aware lockf

	- Directory change notification (F_NOTIFY)

	- Distributed Caching (F_SETLEASE/F_GETLEASE/break_lease)

	- POSIX ACLs

Documentation/filesystems/proc.txt

+27 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ Table of Contents 
  2.14	/proc/<pid>/io - Display the IO accounting fields

  2.15	/proc/<pid>/coredump_filter - Core dump filtering settings

  2.16	/proc/<pid>/mountinfo - Information about mounts

  2.17	/proc/sys/fs/epoll - Configuration options for the epoll interface



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

Preface
@@ -2483,4 +2484,30 @@ For more information on mount propagation see: 


  Documentation/filesystems/sharedsubtree.txt



2.17	/proc/sys/fs/epoll - Configuration options for the epoll interface

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



This directory contains configuration options for the epoll(7) interface.



max_user_instances

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



This is the maximum number of epoll file descriptors that a single user can

have open at a given time. The default value is 128, and should be enough

for normal users.



max_user_watches

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



Every epoll file descriptor can store a number of files to be monitored

for event readiness. Each one of these monitored files constitutes a "watch".

This configuration option sets the maximum number of "watches" that are

allowed for each user.

Each "watch" costs roughly 90 bytes on a 32bit kernel, and roughly 160 bytes

on a 64bit one.

The current default value for  max_user_watches  is the 1/32 of the available

low memory, divided for the "watch" cost in bytes.





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

Documentation/local_ops.txt

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static void do_test_timer(unsigned long data) 
	int cpu;



	/* Increment the counters */

	on_each_cpu(test_each, NULL, 0, 1);

	on_each_cpu(test_each, NULL, 1);

	/* Read all the counters */

	printk("Counters read from CPU %d\n", smp_processor_id());

	for_each_online_cpu(cpu) {

Documentation/spi/spi-summary

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ So for example arch/.../mach-*/board-*.c files might have code like: 
	/* if your mach-* infrastructure doesn't support kernels that can

	 * run on multiple boards, pdata wouldn't benefit from "__init".

	 */

	static struct mysoc_spi_data __init pdata = { ... };

	static struct mysoc_spi_data __initdata pdata = { ... };



	static __init board_init(void)

	{