diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:02 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:02 -0500 |
| commit | f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5 (patch) | |
| tree | e53c9e39b3149221779c10595bc59fa02de4f45f /include/linux/elf.h | |
| parent | 76382b5bdb77c29ab430e1b82ef1c604c8dd113b (diff) | |
| parent | 32b53076c31ce9159740b744d5eb5d9505312add (diff) | |
Merge branch 'sh/g3-prep' into sh/for-2.6.33
Diffstat (limited to 'include/linux/elf.h')
| -rw-r--r-- | include/linux/elf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/elf.h b/include/linux/elf.h index 90a4ed0ea0e5..0cc4d55151b7 100644 --- a/include/linux/elf.h +++ b/include/linux/elf.h | |||
| @@ -361,7 +361,7 @@ typedef struct elf64_shdr { | |||
| 361 | #define NT_PPC_VSX 0x102 /* PowerPC VSX registers */ | 361 | #define NT_PPC_VSX 0x102 /* PowerPC VSX registers */ |
| 362 | #define NT_386_TLS 0x200 /* i386 TLS slots (struct user_desc) */ | 362 | #define NT_386_TLS 0x200 /* i386 TLS slots (struct user_desc) */ |
| 363 | #define NT_386_IOPERM 0x201 /* x86 io permission bitmap (1=deny) */ | 363 | #define NT_386_IOPERM 0x201 /* x86 io permission bitmap (1=deny) */ |
| 364 | #define NT_PRXSTATUS 0x300 /* s390 upper register halves */ | 364 | #define NT_S390_HIGH_GPRS 0x300 /* s390 upper register halves */ |
| 365 | 365 | ||
| 366 | 366 | ||
| 367 | /* Note header in a PT_NOTE section */ | 367 | /* Note header in a PT_NOTE section */ |