Merge branch 'test/linux-linaro-lsk-v3.18-android' of... (09147a74) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/arm/memory.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ fffe8000 fffeffff DTCM mapping area for platforms with
		fffe0000 fffe7fff ITCM mapping area for platforms with
		ITCM mounted inside the CPU.

		ffc00000 ffdfffff Fixmap mapping region. Addresses provided
		ffc00000 ffefffff Fixmap mapping region. Addresses provided
		by fix_to_virt() will be located here.

		fee00000 feffffff Mapping of PCI I/O space. This is a static

+11 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ Construction Parameters
		<version> <dev> <hash_dev>
		<data_block_size> <hash_block_size>
		<num_data_blocks> <hash_start_block>
		<algorithm> <digest> <salt>
		<algorithm> <digest> <salt> <mode>

		<version>
		This is the type of the on-disk hash format.
		@@ -62,6 +62,16 @@ Construction Parameters
		<salt>
		The hexadecimal encoding of the salt value.

		<mode>
		Optional. The mode of operation.

		0 is the normal mode of operation where a corrupted block will result in an
		I/O error.

		1 is logging mode where corrupted blocks are logged and a uevent is sent to
		notify user space.


		Theory of operation
		===================

+4 −4

Original line number	Diff line number	Diff line
		@@ -2,10 +2,10 @@ SQUASHFS 4.0 FILESYSTEM
		=======================

		Squashfs is a compressed read-only filesystem for Linux.
		It uses zlib/lzo/xz compression to compress files, inodes and directories.
		Inodes in the system are very small and all blocks are packed to minimise
		data overhead. Block sizes greater than 4K are supported up to a maximum
		of 1Mbytes (default block size 128K).
		It uses zlib, lz4, lzo, or xz compression to compress files, inodes and
		directories. Inodes in the system are very small and all blocks are packed to
		minimise data overhead. Block sizes greater than 4K are supported up to a
		maximum of 1Mbytes (default block size 128K).

		Squashfs is intended for general read-only filesystem use, for archival
		use (i.e. in cases where a .tar.gz file may be used), and in constrained

+7 −0

Original line number	Diff line number	Diff line
		@@ -1378,6 +1378,13 @@ router_solicitations - INTEGER
		routers are present.
		Default: 3

		use_oif_addrs_only - BOOLEAN
		When enabled, the candidate source addresses for destinations
		routed via this interface are restricted to the set of addresses
		configured on this interface (vis. RFC 6724, section 4).

		Default: false

		use_tempaddr - INTEGER
		Preference for Privacy Extensions (RFC3041).
		<= 0 : disable Privacy Extensions

+7 −1

Original line number	Diff line number	Diff line
		@@ -6,12 +6,15 @@ obj-$(CONFIG_CRYPTO_AES_ARM) += aes-arm.o
		obj-$(CONFIG_CRYPTO_AES_ARM_BS) += aes-arm-bs.o
		obj-$(CONFIG_CRYPTO_SHA1_ARM) += sha1-arm.o
		obj-$(CONFIG_CRYPTO_SHA1_ARM_NEON) += sha1-arm-neon.o
		obj-$(CONFIG_CRYPTO_SHA256_ARM) += sha256-arm.o
		obj-$(CONFIG_CRYPTO_SHA512_ARM_NEON) += sha512-arm-neon.o

		aes-arm-y := aes-armv4.o aes_glue.o
		aes-arm-bs-y := aesbs-core.o aesbs-glue.o
		sha1-arm-y := sha1-armv4-large.o sha1_glue.o
		sha1-arm-neon-y := sha1-armv7-neon.o sha1_neon_glue.o
		sha256-arm-neon-$(CONFIG_KERNEL_MODE_NEON) := sha256_neon_glue.o
		sha256-arm-y := sha256-core.o sha256_glue.o $(sha256-arm-neon-y)
		sha512-arm-neon-y := sha512-armv7-neon.o sha512_neon_glue.o

		quiet_cmd_perl = PERL $@
		@@ -20,4 +23,7 @@ quiet_cmd_perl = PERL $@
		$(src)/aesbs-core.S_shipped: $(src)/bsaes-armv7.pl
		$(call cmd,perl)

		.PRECIOUS: $(obj)/aesbs-core.S
		$(src)/sha256-core.S_shipped: $(src)/sha256-armv4.pl
		$(call cmd,perl)

		.PRECIOUS: $(obj)/aesbs-core.S $(obj)/sha256-core.S