Commit 092f4c56 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (Andrew's incoming - part two) 

Says Andrew:

 "60 patches.  That's good enough for -rc1 I guess.  I have quite a lot
  of detritus to be rechecked, work through maintainers, etc.

 - most of the remains of MM
 - rtc
 - various misc
 - cgroups
 - memcg
 - cpusets
 - procfs
 - ipc
 - rapidio
 - sysctl
 - pps
 - w1
 - drivers/misc
 - aio"

* akpm: (60 commits)
  memcg: replace ss->id_lock with a rwlock
  aio: allocate kiocbs in batches
  drivers/misc/vmw_balloon.c: fix typo in code comment
  drivers/misc/vmw_balloon.c: determine page allocation flag can_sleep outside loop
  w1: disable irqs in critical section
  drivers/w1/w1_int.c: multiple masters used same init_name
  drivers/power/ds2780_battery.c: fix deadlock upon insertion and removal
  drivers/power/ds2780_battery.c: add a nolock function to w1 interface
  drivers/power/ds2780_battery.c: create central point for calling w1 interface
  w1: ds2760 and ds2780, use ida for id and ida_simple_get() to get it
  pps gpio client: add missing dependency
  pps: new client driver using GPIO
  pps: default echo function
  include/linux/dma-mapping.h: add dma_zalloc_coherent()
  sysctl: make CONFIG_SYSCTL_SYSCALL default to n
  sysctl: add support for poll()
  RapidIO: documentation update
  drivers/net/rionet.c: fix ethernet address macros for LE platforms
  RapidIO: fix potential null deref in rio_setup_device()
  RapidIO: add mport driver for Tsi721 bridge
  ...
parents 80c28616 c1e2ee2d

Documentation/DMA-API.txt

+7 −0
Original line number Diff line number Diff line
@@ -50,6 +50,13 @@ specify the GFP_ flags (see kmalloc) for the allocation (the 
implementation may choose to ignore flags that affect the location of

the returned memory, like GFP_DMA).



void *

dma_zalloc_coherent(struct device *dev, size_t size,

			     dma_addr_t *dma_handle, gfp_t flag)



Wraps dma_alloc_coherent() and also zeroes the returned memory if the

allocation attempt succeeded.



void

dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,

			   dma_addr_t dma_handle)

Documentation/cgroups/memory.txt

+0 −1
Original line number Diff line number Diff line
@@ -418,7 +418,6 @@ total_unevictable - sum of all children's "unevictable" 


# The following additional stats are dependent on CONFIG_DEBUG_VM.



inactive_ratio		- VM internal parameter. (see mm/page_alloc.c)

recent_rotated_anon	- VM internal parameter. (see mm/vmscan.c)

recent_rotated_file	- VM internal parameter. (see mm/vmscan.c)

recent_scanned_anon	- VM internal parameter. (see mm/vmscan.c)

Documentation/feature-removal-schedule.txt

+0 −35
Original line number Diff line number Diff line
@@ -133,41 +133,6 @@ Who: Pavel Machek <pavel@ucw.cz> 


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



What:	sys_sysctl

When:	September 2010

Option: CONFIG_SYSCTL_SYSCALL

Why:	The same information is available in a more convenient from

	/proc/sys, and none of the sysctl variables appear to be

	important performance wise.



	Binary sysctls are a long standing source of subtle kernel

	bugs and security issues.



	When I looked several months ago all I could find after

	searching several distributions were 5 user space programs and

	glibc (which falls back to /proc/sys) using this syscall.



	The man page for sysctl(2) documents it as unusable for user

	space programs.



	sysctl(2) is not generally ABI compatible to a 32bit user

	space application on a 64bit and a 32bit kernel.



	For the last several months the policy has been no new binary

	sysctls and no one has put forward an argument to use them.



	Binary sysctls issues seem to keep happening appearing so

	properly deprecating them (with a warning to user space) and a

	2 year grace warning period will mean eventually we can kill

	them and end the pain.



	In the mean time individual binary sysctls can be dealt with

	in a piecewise fashion.



Who:	Eric Biederman <ebiederm@xmission.com>



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



What:	/proc/<pid>/oom_adj

When:	August 2012

Why:	/proc/<pid>/oom_adj allows userspace to influence the oom killer's

Documentation/rapidio/rapidio.txt

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ and the default device ID in order to access the device on the active port. 


After the host has completed enumeration of the entire network it releases

devices by clearing device ID locks (calls rio_clear_locks()). For each endpoint

in the system, it sets the Master Enable bit in the Port General Control CSR

in the system, it sets the Discovered bit in the Port General Control CSR

to indicate that enumeration is completed and agents are allowed to execute

passive discovery of the network.

Documentation/rapidio/tsi721.txt

0 → 100644
+49 −0
Original line number Diff line number Diff line 
RapidIO subsystem mport driver for IDT Tsi721 PCI Express-to-SRIO bridge.

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



I. Overview



This driver implements all currently defined RapidIO mport callback functions.

It supports maintenance read and write operations, inbound and outbound RapidIO

doorbells, inbound maintenance port-writes and RapidIO messaging.



To generate SRIO maintenance transactions this driver uses one of Tsi721 DMA

channels. This mechanism provides access to larger range of hop counts and

destination IDs without need for changes in outbound window translation.



RapidIO messaging support uses dedicated messaging channels for each mailbox.

For inbound messages this driver uses destination ID matching to forward messages

into the corresponding message queue. Messaging callbacks are implemented to be

fully compatible with RIONET driver (Ethernet over RapidIO messaging services).



II. Known problems



  None.



III. To do



 Add DMA data transfers (non-messaging).

 Add inbound region (SRIO-to-PCIe) mapping.



IV. Version History



  1.0.0 - Initial driver release.



V.  License

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



  Copyright(c) 2011 Integrated Device Technology, Inc. All rights reserved.



  This program is free software; you can redistribute it and/or modify it

  under the terms of the GNU General Public License as published by the Free

  Software Foundation; either version 2 of the License, or (at your option)

  any later version.



  This program is distributed in the hope that it will be useful, but WITHOUT

  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

  more details.



  You should have received a copy of the GNU General Public License along with

  this program; if not, write to the Free Software Foundation, Inc.,

  59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

CRA Git | Maintained and supported by SUSTech CRA and CCSE