diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 15:32:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 15:32:52 -0400 |
| commit | e4856a70cfc23266631a78e78277cf2b195babee (patch) | |
| tree | e163aa148bf6ec00e1506a870adf3aeabf083f52 /include/asm-um/elf-x86_64.h | |
| parent | d1b5726358ccebcf614fc9f97cdf3354178dcb80 (diff) | |
| parent | 0b59268285ca6cdc46191f2995bf632088e3e277 (diff) | |
Merge branch 'personality' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'personality' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[PATCH] remove unused ibcs2/PER_SVR4 in SET_PERSONALITY
Diffstat (limited to 'include/asm-um/elf-x86_64.h')
| -rw-r--r-- | include/asm-um/elf-x86_64.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-um/elf-x86_64.h b/include/asm-um/elf-x86_64.h index 3b2d5224a7e1..6e8a9195e952 100644 --- a/include/asm-um/elf-x86_64.h +++ b/include/asm-um/elf-x86_64.h | |||
| @@ -114,6 +114,6 @@ extern long elf_aux_hwcap; | |||
| 114 | 114 | ||
| 115 | #define ELF_PLATFORM "x86_64" | 115 | #define ELF_PLATFORM "x86_64" |
| 116 | 116 | ||
| 117 | #define SET_PERSONALITY(ex, ibcs2) do ; while(0) | 117 | #define SET_PERSONALITY(ex) do ; while(0) |
| 118 | 118 | ||
| 119 | #endif | 119 | #endif |