diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 12:32:52 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 12:32:52 -0700 |
commit | e4856a70cfc23266631a78e78277cf2b195babee (patch) | |
tree | e163aa148bf6ec00e1506a870adf3aeabf083f52 /include/asm-um | |
parent | d1b5726358ccebcf614fc9f97cdf3354178dcb80 (diff) | |
parent | 0b59268285ca6cdc46191f2995bf632088e3e277 (diff) | |
download | kernel_samsung_smdk4412-e4856a70cfc23266631a78e78277cf2b195babee.tar.gz kernel_samsung_smdk4412-e4856a70cfc23266631a78e78277cf2b195babee.tar.bz2 kernel_samsung_smdk4412-e4856a70cfc23266631a78e78277cf2b195babee.zip |
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')
-rw-r--r-- | include/asm-um/elf-i386.h | 2 | ||||
-rw-r--r-- | include/asm-um/elf-ppc.h | 2 | ||||
-rw-r--r-- | include/asm-um/elf-x86_64.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-um/elf-i386.h b/include/asm-um/elf-i386.h index 23d6893e861..d0da9d7c537 100644 --- a/include/asm-um/elf-i386.h +++ b/include/asm-um/elf-i386.h @@ -86,7 +86,7 @@ extern long elf_aux_hwcap; extern char * elf_aux_platform; #define ELF_PLATFORM (elf_aux_platform) -#define SET_PERSONALITY(ex, ibcs2) do { } while (0) +#define SET_PERSONALITY(ex) do { } while (0) extern unsigned long vsyscall_ehdr; extern unsigned long vsyscall_end; diff --git a/include/asm-um/elf-ppc.h b/include/asm-um/elf-ppc.h index d3b90b7ac3e..af9463cd8ce 100644 --- a/include/asm-um/elf-ppc.h +++ b/include/asm-um/elf-ppc.h @@ -5,7 +5,7 @@ extern long elf_aux_hwcap; #define ELF_HWCAP (elf_aux_hwcap) -#define SET_PERSONALITY(ex, ibcs2) do ; while(0) +#define SET_PERSONALITY(ex) do ; while(0) #define ELF_EXEC_PAGESIZE 4096 diff --git a/include/asm-um/elf-x86_64.h b/include/asm-um/elf-x86_64.h index 3b2d5224a7e..6e8a9195e95 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; #define ELF_PLATFORM "x86_64" -#define SET_PERSONALITY(ex, ibcs2) do ; while(0) +#define SET_PERSONALITY(ex) do ; while(0) #endif |