revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / fs / partitions / efi.c

diff --git a/fs/partitions/efi.c b/fs/partitions/efi.c
index f245c767ad4d4faeafaf2b8c20c3e081406dcf33..dbb44d4bb8a7fa4267de9181069ef9290262e24c 100644 (file)
--- a/fs/partitions/efi.c
+++ b/fs/partitions/efi.c
@@ -96,7 +96,6 @@
 #include <linux/crc32.h>
 #include <linux/math64.h>
 #include <linux/slab.h>
-#include <linux/nls.h>
 #include "check.h"
 #include "efi.h"
 
@@ -105,7 +104,6 @@
  * the partition tables happens after init too.
  */
 static int force_gpt;
-static u64 force_gpt_sector;
 static int __init
 force_gpt_fn(char *str)
 {
@@ -114,13 +112,6 @@ force_gpt_fn(char *str)
 }
 __setup("gpt", force_gpt_fn);
 
-static int __init force_gpt_sector_fn(char *str)
-{
-       force_gpt_sector = simple_strtoull(str, NULL, 0);
-       return 1;
-}
-__setup("gpt_sector=", force_gpt_sector_fn);
-
 
 /**
  * efi_crc32() - EFI version of crc32 function
@@ -549,9 +540,6 @@ static int find_valid_gpt(struct parsed_partitions *state, gpt_header **gpt,
         if (!good_agpt && force_gpt)
                 good_agpt = is_gpt_valid(state, lastlba, &agpt, &aptes);
 
-       if (!good_agpt && force_gpt && force_gpt_sector)
-               good_agpt = is_gpt_valid(state, force_gpt_sector, &agpt, &aptes);
-
         /* The obviously unsuccessful case */
         if (!good_pgpt && !good_agpt)
                 goto fail;
@@ -629,20 +617,11 @@ int efi_partition(struct parsed_partitions *state)
                u64 start = le64_to_cpu(ptes[i].starting_lba);
                u64 size = le64_to_cpu(ptes[i].ending_lba) -
                           le64_to_cpu(ptes[i].starting_lba) + 1ULL;
-               u8 name[sizeof(ptes->partition_name) / sizeof(efi_char16_t)];
-               int len;
 
                if (!is_pte_valid(&ptes[i], last_lba(state->bdev)))
                        continue;
 
-               len = utf16s_to_utf8s(ptes[i].partition_name,
-                                     sizeof(ptes[i].partition_name) /
-                                     sizeof(efi_char16_t),
-                                     UTF16_LITTLE_ENDIAN, name,
-                                     sizeof(name));
-
-               put_named_partition(state, i+1, start * ssz, size * ssz,
-                                   name, len);
+               put_partition(state, i+1, start * ssz, size * ssz);
 
                /* If this is a RAID volume, tell md */
                if (!efi_guidcmp(ptes[i].partition_type_guid,