Merge "Merge android11-5.4.147+ (f2bbf1b) into msm-5.4" (948d2325) · Commits · e / devices / android_kernel_fairphone_FP5

android/GKI_VERSION

+1 −1

Original line number	Diff line number	Diff line
		LTS_5.4.147_983a7e7c981b
		LTS_5.4.147_f2bbf1b7baa5

arch/x86/pci/mmconfig-shared.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -425,7 +425,7 @@ static acpi_status find_mboard_resource(acpi_handle handle, u32 lvl,
		return AE_OK;
		}

		static bool is_acpi_reserved(u64 start, u64 end, unsigned not_used)
		static bool is_acpi_reserved(u64 start, u64 end, enum e820_type not_used)
		{
		struct resource mcfg_res;

		@@ -442,7 +442,7 @@ static bool is_acpi_reserved(u64 start, u64 end, unsigned not_used)
		return mcfg_res.flags;
		}

		typedef bool (*check_reserved_t)(u64 start, u64 end, unsigned type);
		typedef bool (*check_reserved_t)(u64 start, u64 end, enum e820_type type);

		static bool __ref is_mmconf_reserved(check_reserved_t is_reserved,
		struct pci_mmcfg_region *cfg,

drivers/base/power/wakeup_stats.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ static ssize_t active_time_ms_show(struct device *dev,
		ktime_t active_time =
		ws->active ? ktime_sub(ktime_get(), ws->last_time) : 0;

		return sprintf(buf, "%lld\n", ktime_to_ms(active_time));
		return sysfs_emit(buf, "%lld\n", ktime_to_ms(active_time));
		}
		static DEVICE_ATTR_RO(active_time_ms);

		@@ -57,7 +57,7 @@ static ssize_t total_time_ms_show(struct device *dev,
		active_time = ktime_sub(ktime_get(), ws->last_time);
		total_time = ktime_add(total_time, active_time);
		}
		return sprintf(buf, "%lld\n", ktime_to_ms(total_time));
		return sysfs_emit(buf, "%lld\n", ktime_to_ms(total_time));
		}
		static DEVICE_ATTR_RO(total_time_ms);

		@@ -73,7 +73,7 @@ static ssize_t max_time_ms_show(struct device *dev,
		if (active_time > max_time)
		max_time = active_time;
		}
		return sprintf(buf, "%lld\n", ktime_to_ms(max_time));
		return sysfs_emit(buf, "%lld\n", ktime_to_ms(max_time));
		}
		static DEVICE_ATTR_RO(max_time_ms);

		@@ -82,7 +82,7 @@ static ssize_t last_change_ms_show(struct device *dev,
		{
		struct wakeup_source *ws = dev_get_drvdata(dev);

		return sprintf(buf, "%lld\n", ktime_to_ms(ws->last_time));
		return sysfs_emit(buf, "%lld\n", ktime_to_ms(ws->last_time));
		}
		static DEVICE_ATTR_RO(last_change_ms);

		@@ -91,7 +91,7 @@ static ssize_t name_show(struct device dev, struct device_attribute attr,
		{
		struct wakeup_source *ws = dev_get_drvdata(dev);

		return sprintf(buf, "%s\n", ws->name);
		return sysfs_emit(buf, "%s\n", ws->name);
		}
		static DEVICE_ATTR_RO(name);

		@@ -106,7 +106,7 @@ static ssize_t prevent_suspend_time_ms_show(struct device *dev,
		prevent_sleep_time = ktime_add(prevent_sleep_time,
		ktime_sub(ktime_get(), ws->start_prevent_time));
		}
		return sprintf(buf, "%lld\n", ktime_to_ms(prevent_sleep_time));
		return sysfs_emit(buf, "%lld\n", ktime_to_ms(prevent_sleep_time));
		}
		static DEVICE_ATTR_RO(prevent_suspend_time_ms);