Merge tag 'v3.9' into efi-for-tip2

Resolve conflicts for Ingo.

Conflicts:
	drivers/firmware/Kconfig
	drivers/firmware/efivars.c

Signed-off-by: Matt Fleming <matt.fleming@intel.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c
index 34c48f1fcdbc..525a2a1ac16c 100644
--- a/fs/efivarfs/super.c
+++ b/fs/efivarfs/super.c
@@ -12,6 +12,7 @@
 #include <linux/fs.h>
 #include <linux/module.h>
 #include <linux/pagemap.h>
+#include <linux/ucs2_string.h>
 
 #include "internal.h"
 
@@ -135,7 +136,7 @@ static int efivarfs_callback(efi_char16_t *name16, efi_guid_t vendor,
         memcpy(entry->var.VariableName, name16, name_size);
         memcpy(&(entry->var.VendorGuid), &vendor, sizeof(efi_guid_t));
 
-        len = utf16_strlen(entry->var.VariableName);
+        len = ucs2_strlen(entry->var.VariableName);
 
         /* name, plus '-', plus GUID, plus NUL*/
         name = kmalloc(len + 1 + EFI_VARIABLE_GUID_LEN + 1, GFP_KERNEL);