Merge "Merge android-4.4.159 (624c095) into msm-4.4" (bbaf766c) · Commits · e / devices / android_kernel_sony_msm8998

Documentation/ABI/testing/sysfs-fs-f2fs

+8 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,14 @@ Description:
		Controls the dirty page count condition for the in-place-update
		policies.

		What: /sys/fs/f2fs/<disk>/min_seq_blocks
		Date: August 2018
		Contact: "Jaegeuk Kim" <jaegeuk@kernel.org>
		Description:
		Controls the dirty page count condition for batched sequential
		writes in ->writepages.


		What: /sys/fs/f2fs/<disk>/min_hot_blocks
		Date: March 2017
		Contact: "Jaegeuk Kim" <jaegeuk@kernel.org>

+20 −0

Original line number	Diff line number	Diff line
		@@ -155,6 +155,26 @@ noinline_data Disable the inline data feature, inline data feature is
		enabled by default.
		data_flush Enable data flushing before checkpoint in order to
		persist data of regular and symlink.
		fault_injection=%d Enable fault injection in all supported types with
		specified injection rate.
		fault_type=%d Support configuring fault injection type, should be
		enabled with fault_injection option, fault type value
		is shown below, it supports single or combined type.
		Type_Name Type_Value
		FAULT_KMALLOC 0x000000001
		FAULT_KVMALLOC 0x000000002
		FAULT_PAGE_ALLOC 0x000000004
		FAULT_PAGE_GET 0x000000008
		FAULT_ALLOC_BIO 0x000000010
		FAULT_ALLOC_NID 0x000000020
		FAULT_ORPHAN 0x000000040
		FAULT_BLOCK 0x000000080
		FAULT_DIR_DEPTH 0x000000100
		FAULT_EVICT_INODE 0x000000200
		FAULT_TRUNCATE 0x000000400
		FAULT_IO 0x000000800
		FAULT_CHECKPOINT 0x000001000
		FAULT_DISCARD 0x000002000
		mode=%s Control block allocation mode which supports "adaptive"
		and "lfs". In "lfs" mode, there should be no random
		writes towards main area.

+1 −1

+1 −1

Original line number	Diff line number	Diff line
		@@ -477,7 +477,7 @@ static void xen_convert_regs(const struct xen_pmu_regs *xen_regs,
		irqreturn_t xen_pmu_irq_handler(int irq, void *dev_id)
		{
		int err, ret = IRQ_NONE;
		struct pt_regs regs;
		struct pt_regs regs = {0};
		const struct xen_pmu_data *xenpmu_data = get_xenpmu_data();
		uint8_t xenpmu_flags = get_xenpmu_flags();

+11 −9

Original line number	Diff line number	Diff line
		@@ -253,12 +253,16 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)
		nv_connector->edid = NULL;
		}

		/* Outputs are only polled while runtime active, so acquiring a
		* runtime PM ref here is unnecessary (and would deadlock upon
		* runtime suspend because it waits for polling to finish).
		/* Outputs are only polled while runtime active, so resuming the
		* device here is unnecessary (and would deadlock upon runtime suspend
		* because it waits for polling to finish). We do however, want to
		* prevent the autosuspend timer from elapsing during this operation
		* if possible.
		*/
		if (!drm_kms_helper_is_poll_worker()) {
		ret = pm_runtime_get_sync(connector->dev->dev);
		if (drm_kms_helper_is_poll_worker()) {
		pm_runtime_get_noresume(dev->dev);
		} else {
		ret = pm_runtime_get_sync(dev->dev);
		if (ret < 0 && ret != -EACCES)
		return conn_status;
		}
		@@ -329,10 +333,8 @@ detect_analog:

		out:

		if (!drm_kms_helper_is_poll_worker()) {
		pm_runtime_mark_last_busy(connector->dev->dev);
		pm_runtime_put_autosuspend(connector->dev->dev);
		}
		pm_runtime_mark_last_busy(dev->dev);
		pm_runtime_put_autosuspend(dev->dev);

		return conn_status;
		}