Commit b9da0571 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (31 commits)
  driver core: Display error codes when class suspend fails
  Driver core: Add section count to memory_block struct
  Driver core: Add mutex for adding/removing memory blocks
  Driver core: Move find_memory_block routine
  hpilo: Despecificate driver from iLO generation
  driver core: Convert link_mem_sections to use find_memory_block_hinted.
  driver core: Introduce find_memory_block_hinted which utilizes kset_find_obj_hinted.
  kobject: Introduce kset_find_obj_hinted.
  driver core: fix build for CONFIG_BLOCK not enabled
  driver-core: base: change to new flag variable
  sysfs: only access bin file vm_ops with the active lock
  sysfs: Fail bin file mmap if vma close is implemented.
  FW_LOADER: fix kconfig dependency warning on HOTPLUG
  uio: Statically allocate uio_class and use class .dev_attrs.
  uio: Support 2^MINOR_BITS minors
  uio: Cleanup irq handling.
  uio: Don't clear driver data
  uio: Fix lack of locking in init_uio_class
  SYSFS: Allow boot time switching between deprecated and modern sysfs layout
  driver core: remove CONFIG_SYSFS_DEPRECATED_V2 but keep it for block devices
  ...
parents f8cae0f0 5abd9356

Documentation/ABI/testing/sysfs-module

0 → 100644
+12 −0
Original line number Diff line number Diff line 
What:		/sys/module/pch_phub/drivers/.../pch_mac

Date:		August 2010

KernelVersion:	2.6.35

Contact:	masa-korg@dsn.okisemi.com

Description:	Write/read GbE MAC address.



What:		/sys/module/pch_phub/drivers/.../pch_firmware

Date:		August 2010

KernelVersion:	2.6.35

Contact:	masa-korg@dsn.okisemi.com

Description:	Write/read Option ROM data.

Documentation/dynamic-debug-howto.txt

+21 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ Dynamic debug has even more useful features: 
   read to display the complete list of known debug statements, to help guide you



Controlling dynamic debug Behaviour

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

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



The behaviour of pr_debug()/dev_debug()s are controlled via writing to a

control file in the 'debugfs' filesystem. Thus, you must first mount the debugfs
@@ -212,6 +212,26 @@ Note the regexp ^[-+=][scp]+$ matches a flags specification. 
Note also that there is no convenient syntax to remove all

the flags at once, you need to use "-psc".





Debug messages during boot process

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



To be able to activate debug messages during the boot process,

even before userspace and debugfs exists, use the boot parameter:

ddebug_query="QUERY"



QUERY follows the syntax described above, but must not exceed 1023

characters. The enablement of debug messages is done as an arch_initcall.

Thus you can enable debug messages in all code processed after this

arch_initcall via this boot parameter.

On an x86 system for example ACPI enablement is a subsys_initcall and

ddebug_query="file ec.c +p"

will show early Embedded Controller transactions during ACPI setup if

your machine (typically a laptop) has an Embedded Controller.

PCI (or other devices) initialization also is a hot candidate for using

this boot parameter for debugging purposes.





Examples

========

Documentation/kernel-parameters.txt

+15 −1
Original line number Diff line number Diff line
@@ -43,10 +43,11 @@ parameter is applicable: 
	AVR32	AVR32 architecture is enabled.

	AX25	Appropriate AX.25 support is enabled.

	BLACKFIN Blackfin architecture is enabled.

	DRM	Direct Rendering Management support is enabled.

	EDD	BIOS Enhanced Disk Drive Services (EDD) is enabled

	EFI	EFI Partitioning (GPT) is enabled

	EIDE	EIDE/ATAPI support is enabled.

	DRM	Direct Rendering Management support is enabled.

	DYNAMIC_DEBUG Build in debug messages and enable them at runtime

	FB	The frame buffer device is enabled.

	GCOV	GCOV profiling is enabled.

	HW	Appropriate hardware is enabled.
@@ -570,6 +571,10 @@ and is between 256 and 4096 characters. It is defined in the file 
			Format: <port#>,<type>

			See also Documentation/input/joystick-parport.txt



	ddebug_query=   [KNL,DYNAMIC_DEBUG] Enable debug messages at early boot

			time. See Documentation/dynamic-debug-howto.txt for

			details.



	debug		[KNL] Enable kernel debugging (events log level).



	debug_locks_verbose=
@@ -2370,6 +2375,15 @@ and is between 256 and 4096 characters. It is defined in the file 


	switches=	[HW,M68k]



	sysfs.deprecated=0|1 [KNL]

			Enable/disable old style sysfs layout for old udev

			on older distributions. When this option is enabled

			very new udev will not work anymore. When this option

			is disabled (or CONFIG_SYSFS_DEPRECATED not compiled)

			in older udev will not work anymore.

			Default depends on CONFIG_SYSFS_DEPRECATED_V2 set in

			the kernel configuration.



	sysrq_always_enabled

			[KNL]

			Ignore sysrq setting - this boot parameter will

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -2064,14 +2064,16 @@ F: drivers/block/drbd/ 
F:	lib/lru_cache.c

F:	Documentation/blockdev/drbd/



DRIVER CORE, KOBJECTS, AND SYSFS

DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS

M:	Greg Kroah-Hartman <gregkh@suse.de>

T:	quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/

S:	Supported

F:	Documentation/kobject.txt

F:	drivers/base/

F:	fs/sysfs/

F:	fs/debugfs/

F:	include/linux/kobj*

F:	include/linux/debugfs.h

F:	lib/kobj*



DRM DRIVERS

block/genhd.c

+2 −5
Original line number Diff line number Diff line
@@ -22,9 +22,7 @@ 
#include "blk.h"



static DEFINE_MUTEX(block_class_lock);

#ifndef CONFIG_SYSFS_DEPRECATED

struct kobject *block_depr;

#endif



/* for extended dynamic devt allocation, currently only one major is used */

#define MAX_EXT_DEVT		(1 << MINORBITS)
@@ -810,10 +808,9 @@ static int __init genhd_device_init(void) 


	register_blkdev(BLOCK_EXT_MAJOR, "blkext");



#ifndef CONFIG_SYSFS_DEPRECATED

	/* create top-level block dir */

	if (!sysfs_deprecated)

		block_depr = kobject_create_and_add("block", NULL);

#endif

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE