Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (242e5d06) · Commits · 戴 / test

Documentation/ABI/testing/pstore

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		Where: /dev/pstore/...
		Date: January 2011
		Kernel Version: 2.6.38
		Contact: tony.luck@intel.com
		Description: Generic interface to platform dependent persistent storage.

		Platforms that provide a mechanism to preserve some data
		across system reboots can register with this driver to
		provide a generic interface to show records captured in
		the dying moments. In the case of a panic the last part
		of the console log is captured, but other interesting
		data can also be saved.

		# mount -t pstore - /dev/pstore

		$ ls -l /dev/pstore
		total 0
		-r--r--r-- 1 root root 7896 Nov 30 15:38 dmesg-erst-1

		Different users of this interface will result in different
		filename prefixes. Currently two are defined:

		"dmesg" - saved console log
		"mce" - architecture dependent data from fatal h/w error

		Once the information in a file has been read, removing
		the file will signal to the underlying persistent storage
		device that it can reclaim the space for later re-use.

		$ rm /dev/pstore/dmesg-erst-1

		The expectation is that all files in /dev/pstore
		will be saved elsewhere and erased from persistent store
		soon after boot to free up space ready for the next
		catastrophe.

0 → 100644

+7 −0

Original line number	Diff line number	Diff line
		What: /sys/fs/pstore/kmsg_bytes
		Date: January 2011
		Kernel Version: 2.6.38
		Contact: "Tony Luck" <tony.luck@intel.com>
		Description:
		Controls amount of console log that will be saved
		to persistent store on oops/panic.

+1 −0

Original line number	Diff line number	Diff line
		@@ -233,3 +233,4 @@ CONFIG_CRYPTO_PCBC=m
		CONFIG_CRYPTO_MD5=y
		# CONFIG_CRYPTO_ANSI_CPRNG is not set
		CONFIG_CRC_T10DIF=y
		CONFIG_MISC_DEVICES=y

+1 −0

+2 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,8 @@

		#define ARCH_HAS_DMA_GET_REQUIRED_MASK

		#define DMA_ERROR_CODE 0

		extern struct dma_map_ops *dma_ops;
		extern struct ia64_machine_vector ia64_mv;
		extern void set_iommu_machvec(void);