Page MenuHomeFreeBSD
Files F108567742

D44214.diff
No OneTemporary
Actions

D44214.diff
View Options

diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -88,8 +88,9 @@
const char *interp, int32_t *osrel, uint32_t *fctl0);
static int __elfN(load_file)(struct proc *p, const char *file, u_long *addr,
u_long *entry);
-static int __elfN(load_section)(struct image_params *imgp, vm_ooffset_t offset,
- caddr_t vmaddr, size_t memsz, size_t filsz, vm_prot_t prot);
+static int __elfN(load_section)(const struct image_params *imgp,
+ vm_ooffset_t offset, caddr_t vmaddr, size_t memsz, size_t filsz,
+ vm_prot_t prot);
static int __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp);
static bool __elfN(freebsd_trans_osrel)(const Elf_Note *note,
int32_t *osrel);
@@ -545,9 +546,9 @@
}
static int
-__elfN(map_insert)(struct image_params *imgp, vm_map_t map, vm_object_t object,
- vm_ooffset_t offset, vm_offset_t start, vm_offset_t end, vm_prot_t prot,
- int cow)
+__elfN(map_insert)(const struct image_params *imgp, vm_map_t map,
+ vm_object_t object, vm_ooffset_t offset, vm_offset_t start, vm_offset_t end,
+ vm_prot_t prot, int cow)
{
struct sf_buf *sf;
vm_offset_t off;
@@ -616,9 +617,9 @@
return (KERN_SUCCESS);
}
-static int
-__elfN(load_section)(struct image_params *imgp, vm_ooffset_t offset,
- caddr_t vmaddr, size_t memsz, size_t filsz, vm_prot_t prot)
+static int __elfN(load_section)(const struct image_params *imgp,
+ vm_ooffset_t offset, caddr_t vmaddr, size_t memsz, size_t filsz,
+ vm_prot_t prot)
{
struct sf_buf *sf;
size_t map_len;
@@ -721,7 +722,7 @@
}
static int
-__elfN(load_sections)(struct image_params *imgp, const Elf_Ehdr *hdr,
+__elfN(load_sections)(const struct image_params *imgp, const Elf_Ehdr *hdr,
const Elf_Phdr *phdr, u_long rbase, u_long *base_addrp)
{
vm_prot_t prot;
@@ -2711,7 +2712,7 @@
#define MAX_NOTES_LOOP 4096
bool
-__elfN(parse_notes)(struct image_params *imgp, Elf_Note *checknote,
+__elfN(parse_notes)(const struct image_params *imgp, Elf_Note *checknote,
const char *note_vendor, const Elf_Phdr *pnote,
bool (*cb)(const Elf_Note *, void *, bool *), void *cb_arg)
{
diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h
--- a/sys/sys/imgact_elf.h
+++ b/sys/sys/imgact_elf.h
@@ -123,9 +123,9 @@
void __elfN(size_segments)(struct thread *, struct sseg_closure *, int);
size_t __elfN(register_note)(struct thread *, struct note_info_list *,
int, outfunc_t, void *);
-bool __elfN(parse_notes)(struct image_params *, Elf_Note *, const char *,
- const Elf_Phdr *, bool (*)(const Elf_Note *, void *, bool *),
- void *);
+bool __elfN(parse_notes)(const struct image_params *, Elf_Note *,
+ const char *, const Elf_Phdr *,
+ bool (*)(const Elf_Note *, void *, bool *), void *);
/* Machine specific function to dump per-thread information. */
void __elfN(dump_thread)(struct thread *, void *, size_t *);

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 27, 10:45 AM (4 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16194479
Default Alt Text
D44214.diff (2 KB)

Event Timeline