mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
synced 2026-11-01 14:53:11 +01:00
Mike Rapoport
65fddcfca8
The replacement of <asm/pgrable.h> with <linux/pgtable.h> made the include
of the latter in the middle of asm includes. Fix this up with the aid of
the below script and manual adjustments here and there.
import sys
import re
if len(sys.argv) is not 3:
print "USAGE: %s <file> <header>" % (sys.argv[0])
sys.exit(1)
hdr_to_move="#include <linux/%s>" % sys.argv[2]
moved = False
in_hdrs = False
with open(sys.argv[1], "r") as f:
lines = f.readlines()
for _line in lines:
line = _line.rstrip('
')
if line == hdr_to_move:
continue
if line.startswith("#include <linux/"):
in_hdrs = True
elif not moved and in_hdrs:
moved = True
print hdr_to_move
print line
Signed-off-by: Mike Rapoport <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Brian Cain <[email protected]>
Cc: Catalin Marinas <[email protected]>
Cc: Chris Zankel <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Geert Uytterhoeven <[email protected]>
Cc: Greentime Hu <[email protected]>
Cc: Greg Ungerer <[email protected]>
Cc: Guan Xuetao <[email protected]>
Cc: Guo Ren <[email protected]>
Cc: Heiko Carstens <[email protected]>
Cc: Helge Deller <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Ley Foon Tan <[email protected]>
Cc: Mark Salter <[email protected]>
Cc: Matthew Wilcox <[email protected]>
Cc: Matt Turner <[email protected]>
Cc: Max Filippov <[email protected]>
Cc: Michael Ellerman <[email protected]>
Cc: Michal Simek <[email protected]>
Cc: Nick Hu <[email protected]>
Cc: Paul Walmsley <[email protected]>
Cc: Richard Weinberger <[email protected]>
Cc: Rich Felker <[email protected]>
Cc: Russell King <[email protected]>
Cc: Stafford Horne <[email protected]>
Cc: Thomas Bogendoerfer <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Tony Luck <[email protected]>
Cc: Vincent Chen <[email protected]>
Cc: Vineet Gupta <[email protected]>
Cc: Will Deacon <[email protected]>
Cc: Yoshinori Sato <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Linus Torvalds <[email protected]>
123 lines
2.9 KiB
C
123 lines
2.9 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright (C) 2007-2009 Michal Simek <[email protected]>
|
|
* Copyright (C) 2007-2009 PetaLogix
|
|
*/
|
|
|
|
#include <linux/export.h>
|
|
#include <linux/moduleloader.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/elf.h>
|
|
#include <linux/vmalloc.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/string.h>
|
|
#include <linux/pgtable.h>
|
|
|
|
#include <asm/cacheflush.h>
|
|
|
|
int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab,
|
|
unsigned int symindex, unsigned int relsec, struct module *module)
|
|
{
|
|
|
|
unsigned int i;
|
|
Elf32_Rela *rela = (void *)sechdrs[relsec].sh_addr;
|
|
Elf32_Sym *sym;
|
|
unsigned long int *location;
|
|
unsigned long int value;
|
|
#if __GNUC__ < 4
|
|
unsigned long int old_value;
|
|
#endif
|
|
|
|
pr_debug("Applying add relocation section %u to %u\n",
|
|
relsec, sechdrs[relsec].sh_info);
|
|
|
|
for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rela); i++) {
|
|
|
|
location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr +
|
|
rela[i].r_offset;
|
|
sym = (Elf32_Sym *)sechdrs[symindex].sh_addr +
|
|
ELF32_R_SYM(rela[i].r_info);
|
|
value = sym->st_value + rela[i].r_addend;
|
|
|
|
switch (ELF32_R_TYPE(rela[i].r_info)) {
|
|
|
|
/*
|
|
* Be careful! mb-gcc / mb-ld splits the relocs between the
|
|
* text and the reloc table. In general this means we must
|
|
* read the current contents of (*location), add any offset
|
|
* then store the result back in
|
|
*/
|
|
|
|
case R_MICROBLAZE_32:
|
|
#if __GNUC__ < 4
|
|
old_value = *location;
|
|
*location = value + old_value;
|
|
|
|
pr_debug("R_MICROBLAZE_32 (%08lx->%08lx)\n",
|
|
old_value, value);
|
|
#else
|
|
*location = value;
|
|
#endif
|
|
break;
|
|
|
|
case R_MICROBLAZE_64:
|
|
#if __GNUC__ < 4
|
|
/* Split relocs only required/used pre gcc4.1.1 */
|
|
old_value = ((location[0] & 0x0000FFFF) << 16) |
|
|
(location[1] & 0x0000FFFF);
|
|
value += old_value;
|
|
#endif
|
|
location[0] = (location[0] & 0xFFFF0000) |
|
|
(value >> 16);
|
|
location[1] = (location[1] & 0xFFFF0000) |
|
|
(value & 0xFFFF);
|
|
#if __GNUC__ < 4
|
|
pr_debug("R_MICROBLAZE_64 (%08lx->%08lx)\n",
|
|
old_value, value);
|
|
#endif
|
|
break;
|
|
|
|
case R_MICROBLAZE_64_PCREL:
|
|
#if __GNUC__ < 4
|
|
old_value = (location[0] & 0xFFFF) << 16 |
|
|
(location[1] & 0xFFFF);
|
|
value -= old_value;
|
|
#endif
|
|
value -= (unsigned long int)(location) + 4;
|
|
location[0] = (location[0] & 0xFFFF0000) |
|
|
(value >> 16);
|
|
location[1] = (location[1] & 0xFFFF0000) |
|
|
(value & 0xFFFF);
|
|
pr_debug("R_MICROBLAZE_64_PCREL (%08lx)\n",
|
|
value);
|
|
break;
|
|
|
|
case R_MICROBLAZE_32_PCREL_LO:
|
|
pr_debug("R_MICROBLAZE_32_PCREL_LO\n");
|
|
break;
|
|
|
|
case R_MICROBLAZE_64_NONE:
|
|
pr_debug("R_MICROBLAZE_64_NONE\n");
|
|
break;
|
|
|
|
case R_MICROBLAZE_NONE:
|
|
pr_debug("R_MICROBLAZE_NONE\n");
|
|
break;
|
|
|
|
default:
|
|
pr_err("module %s: Unknown relocation: %u\n",
|
|
module->name,
|
|
ELF32_R_TYPE(rela[i].r_info));
|
|
return -ENOEXEC;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int module_finalize(const Elf32_Ehdr *hdr, const Elf_Shdr *sechdrs,
|
|
struct module *module)
|
|
{
|
|
flush_dcache();
|
|
return 0;
|
|
}
|