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

Commit 8067794b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/x2apic 



Conflicts:

	arch/x86/kernel/genapic_64.c

Manual merge:

	arch/x86/kernel/genx2apic_uv_x.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 7ab6af7a 796aadeb

Documentation/00-INDEX

+0 −4
Original line number Diff line number Diff line
@@ -89,8 +89,6 @@ cciss.txt 
	- info, major/minor #'s for Compaq's SMART Array Controllers.

cdrom/

	- directory with information on the CD-ROM drivers that Linux has.

cli-sti-removal.txt

	- cli()/sti() removal guide.

computone.txt

	- info on Computone Intelliport II/Plus Multiport Serial Driver.

connector/
@@ -361,8 +359,6 @@ telephony/ 
	- directory with info on telephony (e.g. voice over IP) support.

time_interpolators.txt

	- info on time interpolators.

tipar.txt

	- information about Parallel link cable for Texas Instruments handhelds.

tty.txt

	- guide to the locking policies of the tty layer.

uml/

Documentation/ABI/testing/sysfs-class-regulator

0 → 100644
+315 −0
Original line number Diff line number Diff line 
What:		/sys/class/regulator/.../state

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Description:

		Each regulator directory will contain a field called

		state. This holds the regulator output state.



		This will be one of the following strings:



		'enabled'

		'disabled'

		'unknown'



		'enabled' means the regulator output is ON and is supplying

		power to the system.



		'disabled' means the regulator output is OFF and is not

		supplying power to the system..



		'unknown' means software cannot determine the state.



		NOTE: this field can be used in conjunction with microvolts

		and microamps to determine regulator output levels.





What:		/sys/class/regulator/.../type

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Description:

		Each regulator directory will contain a field called

		type. This holds the regulator type.



		This will be one of the following strings:



		'voltage'

		'current'

		'unknown'



		'voltage' means the regulator output voltage can be controlled

		by software.



		'current' means the regulator output current limit can be

		controlled by software.



		'unknown' means software cannot control either voltage or

		current limit.





What:		/sys/class/regulator/.../microvolts

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Description:

		Each regulator directory will contain a field called

		microvolts. This holds the regulator output voltage setting

		measured in microvolts (i.e. E-6 Volts).



		NOTE: This value should not be used to determine the regulator

		output voltage level as this value is the same regardless of

		whether the regulator is enabled or disabled.





What:		/sys/class/regulator/.../microamps

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Description:

		Each regulator directory will contain a field called

		microamps. This holds the regulator output current limit

		setting measured in microamps (i.e. E-6 Amps).



		NOTE: This value should not be used to determine the regulator

		output current level as this value is the same regardless of

		whether the regulator is enabled or disabled.





What:		/sys/class/regulator/.../opmode

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Description:

		Each regulator directory will contain a field called

		opmode. This holds the regulator operating mode setting.



		The opmode value can be one of the following strings:



		'fast'

		'normal'

		'idle'

		'standby'

		'unknown'



		The modes are described in include/linux/regulator/regulator.h



		NOTE: This value should not be used to determine the regulator

		output operating mode as this value is the same regardless of

		whether the regulator is enabled or disabled.





What:		/sys/class/regulator/.../min_microvolts

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Description:

		Each regulator directory will contain a field called

		min_microvolts. This holds the minimum safe working regulator

		output voltage setting for this domain measured in microvolts.



		NOTE: this will return the string 'constraint not defined' if

		the power domain has no min microvolts constraint defined by

		platform code.





What:		/sys/class/regulator/.../max_microvolts

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Description:

		Each regulator directory will contain a field called

		max_microvolts. This holds the maximum safe working regulator

		output voltage setting for this domain measured in microvolts.



		NOTE: this will return the string 'constraint not defined' if

		the power domain has no max microvolts constraint defined by

		platform code.





What:		/sys/class/regulator/.../min_microamps

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Description:

		Each regulator directory will contain a field called

		min_microamps. This holds the minimum safe working regulator

		output current limit setting for this domain measured in

		microamps.



		NOTE: this will return the string 'constraint not defined' if

		the power domain has no min microamps constraint defined by

		platform code.





What:		/sys/class/regulator/.../max_microamps

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Description:

		Each regulator directory will contain a field called

		max_microamps. This holds the maximum safe working regulator

		output current limit setting for this domain measured in

		microamps.



		NOTE: this will return the string 'constraint not defined' if

		the power domain has no max microamps constraint defined by

		platform code.





What:		/sys/class/regulator/.../num_users

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Description:

		Each regulator directory will contain a field called

		num_users. This holds the number of consumer devices that

		have called regulator_enable() on this regulator.





What:		/sys/class/regulator/.../requested_microamps

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Description:

		Each regulator directory will contain a field called

		requested_microamps. This holds the total requested load

		current in microamps for this regulator from all its consumer

		devices.





What:		/sys/class/regulator/.../parent

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Description:

		Some regulator directories will contain a link called parent.

		This points to the parent or supply regulator if one exists.



What:		/sys/class/regulator/.../suspend_mem_microvolts

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Description:

		Each regulator directory will contain a field called

		suspend_mem_microvolts. This holds the regulator output

		voltage setting for this domain measured in microvolts when

		the system is suspended to memory.



		NOTE: this will return the string 'not defined' if

		the power domain has no suspend to memory voltage defined by

		platform code.



What:		/sys/class/regulator/.../suspend_disk_microvolts

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Description:

		Each regulator directory will contain a field called

		suspend_disk_microvolts. This holds the regulator output

		voltage setting for this domain measured in microvolts when

		the system is suspended to disk.



		NOTE: this will return the string 'not defined' if

		the power domain has no suspend to disk voltage defined by

		platform code.



What:		/sys/class/regulator/.../suspend_standby_microvolts

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Description:

		Each regulator directory will contain a field called

		suspend_standby_microvolts. This holds the regulator output

		voltage setting for this domain measured in microvolts when

		the system is suspended to standby.



		NOTE: this will return the string 'not defined' if

		the power domain has no suspend to standby voltage defined by

		platform code.



What:		/sys/class/regulator/.../suspend_mem_mode

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Description:

		Each regulator directory will contain a field called

		suspend_mem_mode. This holds the regulator operating mode

		setting for this domain when the system is suspended to

		memory.



		NOTE: this will return the string 'not defined' if

		the power domain has no suspend to memory mode defined by

		platform code.



What:		/sys/class/regulator/.../suspend_disk_mode

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Description:

		Each regulator directory will contain a field called

		suspend_disk_mode. This holds the regulator operating mode

		setting for this domain when the system is suspended to disk.



		NOTE: this will return the string 'not defined' if

		the power domain has no suspend to disk mode defined by

		platform code.



What:		/sys/class/regulator/.../suspend_standby_mode

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Description:

		Each regulator directory will contain a field called

		suspend_standby_mode. This holds the regulator operating mode

		setting for this domain when the system is suspended to

		standby.



		NOTE: this will return the string 'not defined' if

		the power domain has no suspend to standby mode defined by

		platform code.



What:		/sys/class/regulator/.../suspend_mem_state

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Description:

		Each regulator directory will contain a field called

		suspend_mem_state. This holds the regulator operating state

		when suspended to memory.



		This will be one of the following strings:



		'enabled'

		'disabled'

		'not defined'



What:		/sys/class/regulator/.../suspend_disk_state

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Description:

		Each regulator directory will contain a field called

		suspend_disk_state. This holds the regulator operating state

		when suspended to disk.



		This will be one of the following strings:



		'enabled'

		'disabled'

		'not defined'



What:		/sys/class/regulator/.../suspend_standby_state

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Description:

		Each regulator directory will contain a field called

		suspend_standby_state. This holds the regulator operating

		state when suspended to standby.



		This will be one of the following strings:



		'enabled'

		'disabled'

		'not defined'

Documentation/CodingStyle

+23 −19
Original line number Diff line number Diff line
@@ -474,25 +474,29 @@ make a good program). 
So, you can either get rid of GNU emacs, or change it to use saner

values.  To do the latter, you can stick the following in your .emacs file:



(defun linux-c-mode ()

  "C mode with adjusted defaults for use with the Linux kernel."

  (interactive)

  (c-mode)

  (c-set-style "K&R")

  (setq tab-width 8)

(defun c-lineup-arglist-tabs-only (ignored)

  "Line up argument lists by tabs, not spaces"

  (let* ((anchor (c-langelem-pos c-syntactic-element))

	 (column (c-langelem-2nd-pos c-syntactic-element))

	 (offset (- (1+ column) anchor))

	 (steps (floor offset c-basic-offset)))

    (* (max steps 1)

       c-basic-offset)))



(add-hook 'c-mode-hook

          (lambda ()

            (let ((filename (buffer-file-name)))

              ;; Enable kernel mode for the appropriate files

              (when (and filename

                         (string-match "~/src/linux-trees" filename))

                (setq indent-tabs-mode t)

  (setq c-basic-offset 8))

                (c-set-style "linux")

                (c-set-offset 'arglist-cont-nonempty

                              '(c-lineup-gcc-asm-reg

                                c-lineup-arglist-tabs-only))))))



This will define the M-x linux-c-mode command.  When hacking on a

module, if you put the string -*- linux-c -*- somewhere on the first

two lines, this mode will be automatically invoked. Also, you may want

to add



(setq auto-mode-alist (cons '("/usr/src/linux.*/.*\\.[ch]$" . linux-c-mode)

			auto-mode-alist))



to your .emacs file if you want to have linux-c-mode switched on

automagically when you edit source files under /usr/src/linux.

This will make emacs go better with the kernel coding style for C

files below ~/src/linux-trees.



But even if you fail in getting emacs to do sane formatting, not

everything is lost: use "indent".

Documentation/DMA-API.txt

+2 −2
Original line number Diff line number Diff line
@@ -298,10 +298,10 @@ recommended that you never use these unless you really know what the 
cache width is.



int

dma_mapping_error(dma_addr_t dma_addr)

dma_mapping_error(struct device *dev, dma_addr_t dma_addr)



int

pci_dma_mapping_error(dma_addr_t dma_addr)

pci_dma_mapping_error(struct pci_dev *hwdev, dma_addr_t dma_addr)



In some circumstances dma_map_single and dma_map_page will fail to create

a mapping. A driver can check for these errors by testing the returned

Documentation/DocBook/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \ 
	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \

	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \

	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \

	    mac80211.xml debugobjects.xml

	    mac80211.xml debugobjects.xml sh.xml



###

# The build process is as follows (targets):