diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-07-11 14:21:20 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-07-11 16:22:22 +0800 |
commit | 2120557722577d8cff75a33a799ad15582dbd8ef (patch) | |
tree | 2518d0dd3038f52cc9d4a26200594132e115f829 /block | |
parent | afd012a6a05f426411186b5ed23c99bb0d83cbe7 (diff) | |
parent | 03a929fbcbb1f7dca3cca19eefcbc15ecc191331 (diff) |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts:
arch/arm64/kernel/armv8_deprecated.c
arch/arm64/kernel/efi.c
arch/arm64/kernel/entry.S
arch/arm64/kernel/head.S
arch/arm64/kernel/hw_breakpoint.c
arch/arm64/mm/mmu.c
include/linux/memblock.h
mm/memblock.c
Diffstat (limited to 'block')
-rw-r--r-- | block/partitions/msdos.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/partitions/msdos.c b/block/partitions/msdos.c index 93e7c1b32edd..5610cd537da7 100644 --- a/block/partitions/msdos.c +++ b/block/partitions/msdos.c @@ -300,6 +300,8 @@ static void parse_bsd(struct parsed_partitions *state, continue; bsd_start = le32_to_cpu(p->p_offset); bsd_size = le32_to_cpu(p->p_size); + if (memcmp(flavour, "bsd\0", 4) == 0) + bsd_start += offset; if (offset == bsd_start && size == bsd_size) /* full parent partition, we have it already */ continue; |