summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/elf.h7
-rw-r--r--include/linux/suspend.h2
2 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/elf.h b/include/linux/elf.h
index 052b7401e94a..f5b3ba5a317d 100644
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@ -36,8 +36,9 @@ typedef __s64 Elf64_Sxword;
#define PT_NOTE 4
#define PT_SHLIB 5
#define PT_PHDR 6
-#define PT_LOOS 0x60000000
-#define PT_HIOS 0x6fffffff
+#define PT_TLS 7 /* Thread local storage segment */
+#define PT_LOOS 0x60000000 /* OS-specific */
+#define PT_HIOS 0x6fffffff /* OS-specific */
#define PT_LOPROC 0x70000000
#define PT_HIPROC 0x7fffffff
#define PT_GNU_EH_FRAME 0x6474e550
@@ -109,6 +110,8 @@ typedef __s64 Elf64_Sxword;
*/
#define EM_S390_OLD 0xA390
+#define EM_FRV 0x5441 /* Fujitsu FR-V */
+
/* This is the info that is needed to parse the dynamic section of the file */
#define DT_NULL 0
#define DT_NEEDED 1
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index 4e4c2962809f..898ed7dada2d 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -1,7 +1,7 @@
#ifndef _LINUX_SWSUSP_H
#define _LINUX_SWSUSP_H
-#ifdef CONFIG_X86
+#if defined(CONFIG_X86) || defined(CONFIG_FRV)
#include <asm/suspend.h>
#endif
#include <linux/swap.h>