commit a614e1923d5389d01f3545ee4a90e39a04d0c90d
author Matt Fleming <matt.fleming@intel.com> Tue Apr 30 11:30:24 2013 +0100
committer Matt Fleming <matt.fleming@intel.com> Tue Apr 30 11:42:13 2013 +0100
tree e8e32dba12a66ffd26d78f015a142ac28e19ad8e
parent f53f292eeaa234615c31a1306babe703fc4263f2
parent c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1

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>

fs/efivarfs/super.c

diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c
index 34c48f1..525a2a1 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 @@
 	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);