mirror of
https://github.com/torvalds/linux.git
synced 2026-10-07 22:37:45 -04:00
David Howells
0c552e5fb9
It seems I accidentally switched the guard on linux/elf-fdpic.h from #ifdef __KERNEL__ to #ifndef __KERNEL__ when attempting to expand the guarded region to cover the elf_fdpic_params struct when doing the UAPI split - with the result that the struct became unavailable to kernel code. Move incorrectly guarded bits back to the kernelspace header. Whilst we're at it, the __KERNEL__ guards can be deleted as they're no longer necessary. Reported-by: Fengguang Wu <[email protected]> Reported-by: Lars-Peter Clausen <[email protected]> Signed-off-by: David Howells <[email protected]> cc: Fengguang Wu <[email protected]> cc: Lars-Peter Clausen <[email protected]> cc: [email protected] Signed-off-by: Linus Torvalds <[email protected]>
35 lines
1.0 KiB
C
35 lines
1.0 KiB
C
/* elf-fdpic.h: FDPIC ELF load map
|
|
*
|
|
* Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
|
|
* Written by David Howells ([email protected])
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version
|
|
* 2 of the License, or (at your option) any later version.
|
|
*/
|
|
|
|
#ifndef _UAPI_LINUX_ELF_FDPIC_H
|
|
#define _UAPI_LINUX_ELF_FDPIC_H
|
|
|
|
#include <linux/elf.h>
|
|
|
|
#define PT_GNU_STACK (PT_LOOS + 0x474e551)
|
|
|
|
/* segment mappings for ELF FDPIC libraries/executables/interpreters */
|
|
struct elf32_fdpic_loadseg {
|
|
Elf32_Addr addr; /* core address to which mapped */
|
|
Elf32_Addr p_vaddr; /* VMA recorded in file */
|
|
Elf32_Word p_memsz; /* allocation size recorded in file */
|
|
};
|
|
|
|
struct elf32_fdpic_loadmap {
|
|
Elf32_Half version; /* version of these structures, just in case... */
|
|
Elf32_Half nsegs; /* number of segments */
|
|
struct elf32_fdpic_loadseg segs[];
|
|
};
|
|
|
|
#define ELF32_FDPIC_LOADMAP_VERSION 0x0000
|
|
|
|
#endif /* _UAPI_LINUX_ELF_FDPIC_H */
|