Merge branch 'pstore-efi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (f48d1915) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/firmware/efivars.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -157,7 +157,7 @@ utf16_strnlen(efi_char16_t *s, size_t maxlength)
		return length;
		}

		static unsigned long
		static inline unsigned long
		utf16_strlen(efi_char16_t *s)
		{
		return utf16_strnlen(s, ~0UL);
		@@ -580,8 +580,8 @@ static ssize_t efi_pstore_read(u64 id, enum pstore_type_id type,
		return -1;
		}

		static u64 efi_pstore_write(enum pstore_type_id type, int part, size_t size,
		struct pstore_info *psi)
		static u64 efi_pstore_write(enum pstore_type_id type, unsigned int part,
		size_t size, struct pstore_info *psi)
		{
		return 0;
		}