diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-18 11:41:51 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-18 11:41:51 +0800 |
| commit | d448dce3f4f4ad28c164e05b2696091bf5919fc9 (patch) | |
| tree | ea67e279adedc950c3d4d8e98546b3823a2b3e93 /arch/powerpc/kernel/module_64.c | |
| parent | 34e0913e457f8469667faf5fa600447aa93371cf (diff) | |
| parent | dfbed80c63bb8d965067da3a6dbcc4682edcce0c (diff) | |
Merge remote-tracking branch 'lts/linux-3.14.y' into linux-linaro-lsk-v3.14linux-linaro-lsk-v3.14-test
Conflicts:
Most of conflict happened on efivar_validate() change which
introduced a new parameter to check efi guid.
I added efi guid for this change sanity_check()/efivar_create()
in drivers/firmware/efi/efivars.c
and keep new efivar_validate() in drivers/firmware/efi/vars.c
include/linux/efi.h
Diffstat (limited to 'arch/powerpc/kernel/module_64.c')
| -rw-r--r-- | arch/powerpc/kernel/module_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c index 12664c130d73..78a859ec4946 100644 --- a/arch/powerpc/kernel/module_64.c +++ b/arch/powerpc/kernel/module_64.c @@ -202,7 +202,7 @@ static void dedotify(Elf64_Sym *syms, unsigned int numsyms, char *strtab) if (syms[i].st_shndx == SHN_UNDEF) { char *name = strtab + syms[i].st_name; if (name[0] == '.') - memmove(name, name+1, strlen(name)); + syms[i].st_name++; } } } |