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

Commit 06991c28 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 

Pull driver core patches from Greg Kroah-Hartman:
 "Here is the big driver core merge for 3.9-rc1

  There are two major series here, both of which touch lots of drivers
  all over the kernel, and will cause you some merge conflicts:

   - add a new function called devm_ioremap_resource() to properly be
     able to check return values.

   - remove CONFIG_EXPERIMENTAL

  Other than those patches, there's not much here, some minor fixes and
  updates"

Fix up trivial conflicts

* tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (221 commits)
  base: memory: fix soft/hard_offline_page permissions
  drivercore: Fix ordering between deferred_probe and exiting initcalls
  backlight: fix class_find_device() arguments
  TTY: mark tty_get_device call with the proper const values
  driver-core: constify data for class_find_device()
  firmware: Ignore abort check when no user-helper is used
  firmware: Reduce ifdef CONFIG_FW_LOADER_USER_HELPER
  firmware: Make user-mode helper optional
  firmware: Refactoring for splitting user-mode helper code
  Driver core: treat unregistered bus_types as having no devices
  watchdog: Convert to devm_ioremap_resource()
  thermal: Convert to devm_ioremap_resource()
  spi: Convert to devm_ioremap_resource()
  power: Convert to devm_ioremap_resource()
  mtd: Convert to devm_ioremap_resource()
  mmc: Convert to devm_ioremap_resource()
  mfd: Convert to devm_ioremap_resource()
  media: Convert to devm_ioremap_resource()
  iommu: Convert to devm_ioremap_resource()
  drm: Convert to devm_ioremap_resource()
  ...
parents 460dc1ee 74fef7a8

Documentation/CodingStyle

+1 −9
Original line number Diff line number Diff line
@@ -546,15 +546,7 @@ config AUDIT 
	  logging of avc messages output).  Does not do system-call

	  auditing without CONFIG_AUDITSYSCALL.



Features that might still be considered unstable should be defined as

dependent on "EXPERIMENTAL":



config SLUB

	depends on EXPERIMENTAL && !ARCH_USES_SLAB_PAGE_STRUCT

	bool "SLUB (Unqueued Allocator)"

	...



while seriously dangerous features (such as write support for certain

Seriously dangerous features (such as write support for certain

filesystems) should advertise this prominently in their prompt string:



config ADFS_FS_RW

Documentation/DocBook/kernel-hacking.tmpl

+0 −7
Original line number Diff line number Diff line
@@ -1184,13 +1184,6 @@ static struct block_device_operations opt_fops = { 
     <filename>Documentation/kbuild/kconfig-language.txt</filename>.

    </para>



    <para>

     You may well want to make your CONFIG option only visible if

     <symbol>CONFIG_EXPERIMENTAL</symbol> is enabled: this serves as a

     warning to users.  There many other fancy things you can do: see

     the various <filename>Kconfig</filename> files for ideas.

    </para>



    <para>

     In your description of the option, make sure you address both the

     expert user and the user who knows nothing about your feature.  Mention

Documentation/DocBook/kgdb.tmpl

+2 −4
Original line number Diff line number Diff line
@@ -94,10 +94,8 @@ 
  <sect1 id="CompileKGDB">

    <title>Kernel config options for kgdb</title>

    <para>

    To enable <symbol>CONFIG_KGDB</symbol> you should first turn on

    "Prompt for development and/or incomplete code/drivers"

    (CONFIG_EXPERIMENTAL) in  "General setup", then under the

    "Kernel debugging" select "KGDB: kernel debugger".

    To enable <symbol>CONFIG_KGDB</symbol> you should look under

    "Kernel debugging" and select "KGDB: kernel debugger".

    </para>

    <para>

    While it is not a hard requirement that you have symbols in your

Documentation/driver-model/devres.txt

+6 −1
Original line number Diff line number Diff line
@@ -266,7 +266,8 @@ IOMAP 
  devm_ioremap()

  devm_ioremap_nocache()

  devm_iounmap()

  devm_request_and_ioremap() : checks resource, requests region, ioremaps

  devm_ioremap_resource() : checks resource, requests memory region, ioremaps

  devm_request_and_ioremap() : obsoleted by devm_ioremap_resource()

  pcim_iomap()

  pcim_iounmap()

  pcim_iomap_table()	: array of mapped addresses indexed by BAR
@@ -288,3 +289,7 @@ PINCTRL 
PWM

  devm_pwm_get()

  devm_pwm_put()



PHY

  devm_usb_get_phy()

  devm_usb_put_phy()

Documentation/dynamic-debug-howto.txt

+13 −2
Original line number Diff line number Diff line
@@ -6,8 +6,16 @@ This document describes how to use the dynamic debug (dyndbg) feature. 


Dynamic debug is designed to allow you to dynamically enable/disable

kernel code to obtain additional kernel information.  Currently, if

CONFIG_DYNAMIC_DEBUG is set, then all pr_debug()/dev_dbg() calls can

be dynamically enabled per-callsite.

CONFIG_DYNAMIC_DEBUG is set, then all pr_debug()/dev_dbg() and

print_hex_dump_debug()/print_hex_dump_bytes() calls can be dynamically

enabled per-callsite.



If CONFIG_DYNAMIC_DEBUG is not set, print_hex_dump_debug() is just

shortcut for print_hex_dump(KERN_DEBUG).



For print_hex_dump_debug()/print_hex_dump_bytes(), format string is

its 'prefix_str' argument, if it is constant string; or "hexdump"

in case 'prefix_str' is build dynamically.



Dynamic debug has even more useful features:
@@ -202,6 +210,9 @@ The flags are: 
  t    Include thread ID in messages not generated from interrupt context

  _    No flags are set. (Or'd with others on input)



For print_hex_dump_debug() and print_hex_dump_bytes(), only 'p' flag

have meaning, other flags ignored.



For display, the flags are preceded by '='

(mnemonic: what the flags are currently equal to).