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

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

Merge branch 'linus' into tracing/hw-breakpoints



Conflicts:
	arch/x86/Kconfig
	arch/x86/kernel/traps.c
	arch/x86/power/cpu.c
	arch/x86/power/cpu_32.c
	kernel/Makefile

Semantic conflict:
	arch/x86/kernel/hw_breakpoint.c

Merge reason: Resolve the conflicts, move from put_cpu_no_sched() to
              put_cpu() in arch/x86/kernel/hw_breakpoint.c.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 73874005 65795efb
Loading
Loading
Loading
Loading
+9 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@
# subdirectories here. Add them in the ".gitignore" file
# in that subdirectory instead.
#
# NOTE! Please use 'git-ls-files -i --exclude-standard'
# NOTE! Please use 'git ls-files -i --exclude-standard'
# command after changing this file, to see if there are
# any tracked files which get ignored after the change.
#
@@ -25,6 +25,8 @@
*.elf
*.bin
*.gz
*.lzma
*.patch

#
# Top-level generic files
@@ -62,6 +64,12 @@ series
cscope.*
ncscope.*

# gnu global files
GPATH
GRTAGS
GSYMS
GTAGS

*.orig
*~
\#*#
+4 −0
Original line number Diff line number Diff line
@@ -1253,6 +1253,10 @@ S: 8124 Constitution Apt. 7
S: Sterling Heights, Michigan 48313
S: USA

N: Wolfgang Grandegger
E: wg@grandegger.com
D: Controller Area Network (device drivers)

N: William Greathouse
E: wgreathouse@smva.com
E: wgreathouse@myfavoritei.com
+59 −0
Original line number Diff line number Diff line
@@ -60,3 +60,62 @@ Description:
		Indicates whether the block layer should automatically
		generate checksums for write requests bound for
		devices that support receiving integrity metadata.

What:		/sys/block/<disk>/alignment_offset
Date:		April 2009
Contact:	Martin K. Petersen <martin.petersen@oracle.com>
Description:
		Storage devices may report a physical block size that is
		bigger than the logical block size (for instance a drive
		with 4KB physical sectors exposing 512-byte logical
		blocks to the operating system).  This parameter
		indicates how many bytes the beginning of the device is
		offset from the disk's natural alignment.

What:		/sys/block/<disk>/<partition>/alignment_offset
Date:		April 2009
Contact:	Martin K. Petersen <martin.petersen@oracle.com>
Description:
		Storage devices may report a physical block size that is
		bigger than the logical block size (for instance a drive
		with 4KB physical sectors exposing 512-byte logical
		blocks to the operating system).  This parameter
		indicates how many bytes the beginning of the partition
		is offset from the disk's natural alignment.

What:		/sys/block/<disk>/queue/logical_block_size
Date:		May 2009
Contact:	Martin K. Petersen <martin.petersen@oracle.com>
Description:
		This is the smallest unit the storage device can
		address.  It is typically 512 bytes.

What:		/sys/block/<disk>/queue/physical_block_size
Date:		May 2009
Contact:	Martin K. Petersen <martin.petersen@oracle.com>
Description:
		This is the smallest unit the storage device can write
		without resorting to read-modify-write operation.  It is
		usually the same as the logical block size but may be
		bigger.  One example is SATA drives with 4KB sectors
		that expose a 512-byte logical block size to the
		operating system.

What:		/sys/block/<disk>/queue/minimum_io_size
Date:		April 2009
Contact:	Martin K. Petersen <martin.petersen@oracle.com>
Description:
		Storage devices may report a preferred minimum I/O size,
		which is the smallest request the device can perform
		without incurring a read-modify-write penalty.  For disk
		drives this is often the physical block size.  For RAID
		arrays it is often the stripe chunk size.

What:		/sys/block/<disk>/queue/optimal_io_size
Date:		April 2009
Contact:	Martin K. Petersen <martin.petersen@oracle.com>
Description:
		Storage devices may report an optimal I/O size, which is
		the device's preferred unit of receiving I/O.  This is
		rarely reported for disk drives.  For RAID devices it is
		usually the stripe width or the internal block size.
+33 −0
Original line number Diff line number Diff line
Where:		/sys/bus/pci/devices/<dev>/ccissX/cXdY/model
Date:		March 2009
Kernel Version: 2.6.30
Contact:	iss_storagedev@hp.com
Description:	Displays the SCSI INQUIRY page 0 model for logical drive
		Y of controller X.

Where:		/sys/bus/pci/devices/<dev>/ccissX/cXdY/rev
Date:		March 2009
Kernel Version: 2.6.30
Contact:	iss_storagedev@hp.com
Description:	Displays the SCSI INQUIRY page 0 revision for logical
		drive Y of controller X.

Where:		/sys/bus/pci/devices/<dev>/ccissX/cXdY/unique_id
Date:		March 2009
Kernel Version: 2.6.30
Contact:	iss_storagedev@hp.com
Description:	Displays the SCSI INQUIRY page 83 serial number for logical
		drive Y of controller X.

Where:		/sys/bus/pci/devices/<dev>/ccissX/cXdY/vendor
Date:		March 2009
Kernel Version: 2.6.30
Contact:	iss_storagedev@hp.com
Description:	Displays the SCSI INQUIRY page 0 vendor for logical drive
		Y of controller X.

Where:		/sys/bus/pci/devices/<dev>/ccissX/cXdY/block:cciss!cXdY
Date:		March 2009
Kernel Version: 2.6.30
Contact:	iss_storagedev@hp.com
Description:	A symbolic link to /sys/block/cciss!cXdY
+18 −0
Original line number Diff line number Diff line
What:      /sys/devices/system/cpu/cpu*/cache/index*/cache_disable_X
Date:      August 2008
KernelVersion:	2.6.27
Contact:	mark.langsdorf@amd.com
Description:	These files exist in every cpu's cache index directories.
		There are currently 2 cache_disable_# files in each
		directory.  Reading from these files on a supported
		processor will return that cache disable index value
		for that processor and node.  Writing to one of these
		files will cause the specificed cache index to be disabled.

		Currently, only AMD Family 10h Processors support cache index
		disable, and only for their L3 caches.  See the BIOS and
		Kernel Developer's Guide at
		http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/31116-Public-GH-BKDG_3.20_2-4-09.pdf
		for formatting information and other details on the
		cache index disable.
Users:    joachim.deguara@amd.com
Loading