mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 12:43:29 +02:00
Merge tag 'v6.2-rc6' into sched/core, to pick up fixes
Pick up fixes before merging another batch of cpuidle updates. Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
@@ -2039,7 +2039,7 @@ static int elf_core_dump(struct coredump_params *cprm)
|
||||
* The number of segs are recored into ELF header as 16bit value.
|
||||
* Please check DEFAULT_MAX_MAP_COUNT definition when you modify here.
|
||||
*/
|
||||
segs = cprm->vma_count + elf_core_extra_phdrs();
|
||||
segs = cprm->vma_count + elf_core_extra_phdrs(cprm);
|
||||
|
||||
/* for notes section */
|
||||
segs++;
|
||||
@@ -2079,7 +2079,7 @@ static int elf_core_dump(struct coredump_params *cprm)
|
||||
dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
|
||||
|
||||
offset += cprm->vma_data_size;
|
||||
offset += elf_core_extra_data_size();
|
||||
offset += elf_core_extra_data_size(cprm);
|
||||
e_shoff = offset;
|
||||
|
||||
if (e_phnum == PN_XNUM) {
|
||||
|
Reference in New Issue
Block a user