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

Commit 39ab05c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'driver-core-next' of... 

Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

* 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (44 commits)
  debugfs: Silence DEBUG_STRICT_USER_COPY_CHECKS=y warning
  sysfs: remove "last sysfs file:" line from the oops messages
  drivers/base/memory.c: fix warning due to "memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION"
  memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION
  SYSFS: Fix erroneous comments for sysfs_update_group().
  driver core: remove the driver-model structures from the documentation
  driver core: Add the device driver-model structures to kerneldoc
  Translated Documentation/email-clients.txt
  RAW driver: Remove call to kobject_put().
  reboot: disable usermodehelper to prevent fs access
  efivars: prevent oops on unload when efi is not enabled
  Allow setting of number of raw devices as a module parameter
  Introduce CONFIG_GOOGLE_FIRMWARE
  driver: Google Memory Console
  driver: Google EFI SMI
  x86: Better comments for get_bios_ebda()
  x86: get_bios_ebda_length()
  misc: fix ti-st build issues
  params.c: Use new strtobool function to process boolean inputs
  debugfs: move to new strtobool
  ...

Fix up trivial conflicts in fs/debugfs/file.c due to the same patch
being applied twice, and an unrelated cleanup nearby.
parents 1477fcc2 c42d2237

Documentation/ABI/testing/sysfs-firmware-dmi

+9 −9
Original line number Diff line number Diff line
@@ -14,14 +14,15 @@ Description: 


		DMI is structured as a large table of entries, where

		each entry has a common header indicating the type and

		length of the entry, as well as 'handle' that is

		supposed to be unique amongst all entries.

		length of the entry, as well as a firmware-provided

		'handle' that is supposed to be unique amongst all

		entries.



		Some entries are required by the specification, but many

		others are optional.  In general though, users should

		never expect to find a specific entry type on their

		system unless they know for certain what their firmware

		is doing.  Machine to machine will vary.

		is doing.  Machine to machine experiences will vary.



		Multiple entries of the same type are allowed.  In order

		to handle these duplicate entry types, each entry is
@@ -67,25 +68,24 @@ Description: 
			  and the two terminating nul characters.

		type	: The type of the entry.  This value is the same

			  as found in the directory name.  It indicates

			  how the rest of the entry should be

			  interpreted.

			  how the rest of the entry should be interpreted.

		instance: The instance ordinal of the entry for the

			  given type.  This value is the same as found

			  in the parent directory name.

		position: The position of the entry within the entirety

			  of the entirety.

		position: The ordinal position (zero-based) of the entry

			  within the entirety of the DMI entry table.



		=== Entry Specialization ===



		Some entry types may have other information available in

		sysfs.

		sysfs.  Not all types are specialized.



		--- Type 15 - System Event Log ---



		This entry allows the firmware to export a log of

		events the system has taken.  This information is

		typically backed by nvram, but the implementation

		details are abstracted by this table.  This entries data

		details are abstracted by this table.  This entry's data

		is exported in the directory:



		/sys/firmware/dmi/entries/15-0/system_event_log

Documentation/ABI/testing/sysfs-firmware-gsmi

0 → 100644
+58 −0
Original line number Diff line number Diff line 
What:		/sys/firmware/gsmi

Date:		March 2011

Contact:	Mike Waychison <mikew@google.com>

Description:

		Some servers used internally at Google have firmware

		that provides callback functionality via explicit SMI

		triggers.  Some of the callbacks are similar to those

		provided by the EFI runtime services page, but due to

		historical reasons this different entry-point has been

		used.



		The gsmi driver implements the kernel's abstraction for

		these firmware callbacks.  Currently, this functionality

		is limited to handling the system event log and getting

		access to EFI-style variables stored in nvram.



		Layout:



		/sys/firmware/gsmi/vars:



			This directory has the same layout (and

			underlying implementation as /sys/firmware/efi/vars.

			See Documentation/ABI/*/sysfs-firmware-efi-vars

			for more information on how to interact with

			this structure.



		/sys/firmware/gsmi/append_to_eventlog - write-only:



			This file takes a binary blob and passes it onto

			the firmware to be timestamped and appended to

			the system eventlog.  The binary format is

			interpreted by the firmware and may change from

			platform to platform.  The only kernel-enforced

			requirement is that the blob be prefixed with a

			32bit host-endian type used as part of the

			firmware call.



		/sys/firmware/gsmi/clear_config - write-only:



			Writing any value to this file will cause the

			entire firmware configuration to be reset to

			"factory defaults".  Callers should assume that

			a reboot is required for the configuration to be

			cleared.



		/sys/firmware/gsmi/clear_eventlog - write-only:



			This file is used to clear out a portion/the

			whole of the system event log.  Values written

			should be values between 1 and 100 inclusive (in

			ASCII) representing the fraction of the log to

			clear.  Not all platforms support fractional

			clearing though, and this writes to this file

			will error out if the firmware doesn't like your

			submitted fraction.



			Callers should assume that a reboot is needed

			for this operation to complete.

Documentation/ABI/testing/sysfs-firmware-log

0 → 100644
+7 −0
Original line number Diff line number Diff line 
What:		/sys/firmware/log

Date:		February 2011

Contact:	Mike Waychison <mikew@google.com>

Description:

		The /sys/firmware/log is a binary file that represents a

		read-only copy of the firmware's log if one is

		available.

Documentation/ABI/testing/sysfs-kernel-fscaps

0 → 100644
+8 −0
Original line number Diff line number Diff line 
What:		/sys/kernel/fscaps

Date:		February 2011

KernelVersion:	2.6.38

Contact:	Ludwig Nussel <ludwig.nussel@suse.de>

Description

		Shows whether file system capabilities are honored

		when executing a binary

Documentation/DocBook/device-drivers.tmpl

+3 −3
Original line number Diff line number Diff line
@@ -96,10 +96,10 @@ X!Iinclude/linux/kobject.h 


  <chapter id="devdrivers">

     <title>Device drivers infrastructure</title>

     <sect1><title>The Basic Device Driver-Model Structures </title>

!Iinclude/linux/device.h

     </sect1>

     <sect1><title>Device Drivers Base</title>

<!--

X!Iinclude/linux/device.h

-->

!Edrivers/base/driver.c

!Edrivers/base/core.c

!Edrivers/base/class.c