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

Commit 242e5d06 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] tioca: Fix assignment from incompatible pointer warnings
  [IA64] mca.c: Fix cast from integer to pointer warning
  [IA64] setup.c Typo fix "Architechtuallly"
  [IA64] Add CONFIG_MISC_DEVICES=y to configs that need it.
  [IA64] disable interrupts at end of ia64_mca_cpe_int_handler()
  [IA64] Add DMA_ERROR_CODE define.
  pstore: fix build warning for unused return value from sysfs_create_file
  pstore: X86 platform interface using ACPI/APEI/ERST
  pstore: new filesystem interface to platform persistent storage
parents 4c5811bf afe997a1

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.

Documentation/ABI/testing/sysfs-fs-pstore

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.

arch/ia64/configs/generic_defconfig

+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

arch/ia64/configs/gensparse_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -208,3 +208,4 @@ CONFIG_MAGIC_SYSRQ=y 
CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_CRYPTO_MD5=y

CONFIG_MISC_DEVICES=y

arch/ia64/include/asm/dma-mapping.h

+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);