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

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

Merge branch 'rcu/urgent' of... 

Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/rcu
parents 2dfbf4df 773e3f93

Documentation/DocBook/kernel-locking.tmpl

+6 −0
Original line number Original line Diff line number Diff line
@@ -1955,6 +1955,12 @@ machines due to caching. 
   </sect1>

   </sect1>

  </chapter>

  </chapter>





  <chapter id="apiref">

   <title>Mutex API reference</title>

!Iinclude/linux/mutex.h

!Ekernel/mutex.c

  </chapter>



  <chapter id="references">

  <chapter id="references">

   <title>Further reading</title>

   <title>Further reading</title>

Documentation/DocBook/tracepoint.tmpl

+5 −0
Original line number Original line Diff line number Diff line
@@ -104,4 +104,9 @@ 
   <title>Block IO</title>

   <title>Block IO</title>

!Iinclude/trace/events/block.h

!Iinclude/trace/events/block.h

  </chapter>

  </chapter>



  <chapter id="workqueue">

   <title>Workqueue</title>

!Iinclude/trace/events/workqueue.h

  </chapter>

</book>
 
</book>

Documentation/gpio.txt

+14 −8
Original line number Original line Diff line number Diff line
@@ -109,17 +109,19 @@ use numbers 2000-2063 to identify GPIOs in a bank of I2C GPIO expanders. 




If you want to initialize a structure with an invalid GPIO number, use

If you want to initialize a structure with an invalid GPIO number, use

some negative number (perhaps "-EINVAL"); that will never be valid.  To

some negative number (perhaps "-EINVAL"); that will never be valid.  To

test if a number could reference a GPIO, you may use this predicate:

test if such number from such a structure could reference a GPIO, you

may use this predicate:





	int gpio_is_valid(int number);

	int gpio_is_valid(int number);





A number that's not valid will be rejected by calls which may request

A number that's not valid will be rejected by calls which may request

or free GPIOs (see below).  Other numbers may also be rejected; for

or free GPIOs (see below).  Other numbers may also be rejected; for

example, a number might be valid but unused on a given board.

example, a number might be valid but temporarily unused on a given board.



Whether a platform supports multiple GPIO controllers is currently a

platform-specific implementation issue.





Whether a platform supports multiple GPIO controllers is a platform-specific

implementation issue, as are whether that support can leave "holes" in the space

of GPIO numbers, and whether new controllers can be added at runtime.  Such issues

can affect things including whether adjacent GPIO numbers are both valid.





Using GPIOs

Using GPIOs

-----------

-----------
@@ -480,12 +482,16 @@ To support this framework, a platform's Kconfig will "select" either 
ARCH_REQUIRE_GPIOLIB or ARCH_WANT_OPTIONAL_GPIOLIB

ARCH_REQUIRE_GPIOLIB or ARCH_WANT_OPTIONAL_GPIOLIB

and arrange that its <asm/gpio.h> includes <asm-generic/gpio.h> and defines

and arrange that its <asm/gpio.h> includes <asm-generic/gpio.h> and defines

three functions: gpio_get_value(), gpio_set_value(), and gpio_cansleep().

three functions: gpio_get_value(), gpio_set_value(), and gpio_cansleep().

They may also want to provide a custom value for ARCH_NR_GPIOS.





ARCH_REQUIRE_GPIOLIB means that the gpio-lib code will always get compiled

It may also provide a custom value for ARCH_NR_GPIOS, so that it better

reflects the number of GPIOs in actual use on that platform, without

wasting static table space.  (It should count both built-in/SoC GPIOs and

also ones on GPIO expanders.



ARCH_REQUIRE_GPIOLIB means that the gpiolib code will always get compiled

into the kernel on that architecture.

into the kernel on that architecture.





ARCH_WANT_OPTIONAL_GPIOLIB means the gpio-lib code defaults to off and the user

ARCH_WANT_OPTIONAL_GPIOLIB means the gpiolib code defaults to off and the user

can enable it and build it into the kernel optionally.

can enable it and build it into the kernel optionally.





If neither of these options are selected, the platform does not support

If neither of these options are selected, the platform does not support

Documentation/kernel-parameters.txt

+14 −9
Original line number Original line Diff line number Diff line
@@ -1974,15 +1974,18 @@ and is between 256 and 4096 characters. It is defined in the file 
		force	Enable ASPM even on devices that claim not to support it.

		force	Enable ASPM even on devices that claim not to support it.

			WARNING: Forcing ASPM on may cause system lockups.

			WARNING: Forcing ASPM on may cause system lockups.





	pcie_ports=	[PCIE] PCIe ports handling:

		auto	Ask the BIOS whether or not to use native PCIe services

			associated with PCIe ports (PME, hot-plug, AER).  Use

			them only if that is allowed by the BIOS.

		native	Use native PCIe services associated with PCIe ports

			unconditionally.

		compat	Treat PCIe ports as PCI-to-PCI bridges, disable the PCIe

			ports driver.



	pcie_pme=	[PCIE,PM] Native PCIe PME signaling options:

	pcie_pme=	[PCIE,PM] Native PCIe PME signaling options:

			Format: {auto|force}[,nomsi]

		auto	Use native PCIe PME signaling if the BIOS allows the

			kernel to control PCIe config registers of root ports.

		force	Use native PCIe PME signaling even if the BIOS refuses

			to allow the kernel to control the relevant PCIe config

			registers.

		nomsi	Do not use MSI for native PCIe PME signaling (this makes

		nomsi	Do not use MSI for native PCIe PME signaling (this makes

			all PCIe root ports use INTx for everything).

			all PCIe root ports use INTx for all services).





	pcmv=		[HW,PCMCIA] BadgePAD 4

	pcmv=		[HW,PCMCIA] BadgePAD 4
@@ -2629,8 +2632,10 @@ and is between 256 and 4096 characters. It is defined in the file 
			aux-ide-disks -- unplug non-primary-master IDE devices

			aux-ide-disks -- unplug non-primary-master IDE devices

			nics -- unplug network devices

			nics -- unplug network devices

			all -- unplug all emulated devices (NICs and IDE disks)

			all -- unplug all emulated devices (NICs and IDE disks)

			ignore -- continue loading the Xen platform PCI driver even

			unnecessary -- unplugging emulated devices is

				if the version check failed

				unnecessary even if the host did not respond to

				the unplug protocol

			never -- do not unplug even if version check succeeds





	xirc2ps_cs=	[NET,PCMCIA]

	xirc2ps_cs=	[NET,PCMCIA]

			Format:

			Format:

Documentation/lguest/Makefile

+2 −1
Original line number Original line Diff line number Diff line 
# This creates the demonstration utility "lguest" which runs a Linux guest.

# This creates the demonstration utility "lguest" which runs a Linux guest.

CFLAGS:=-m32 -Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include -I../../arch/x86/include -U_FORTIFY_SOURCE

# Missing headers?  Add "-I../../include -I../../arch/x86/include"

CFLAGS:=-m32 -Wall -Wmissing-declarations -Wmissing-prototypes -O3 -U_FORTIFY_SOURCE





all: lguest

all: lguest