diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
| commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /arch/alpha/include/asm/elf.h | |
| parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
Diffstat (limited to 'arch/alpha/include/asm/elf.h')
| -rw-r--r-- | arch/alpha/include/asm/elf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h index fc1002ea1e0c..5c75c1b2352a 100644 --- a/arch/alpha/include/asm/elf.h +++ b/arch/alpha/include/asm/elf.h | |||
| @@ -144,9 +144,9 @@ extern int dump_elf_task_fp(elf_fpreg_t *dest, struct task_struct *task); | |||
| 144 | : amask (AMASK_CIX) ? "ev6" : "ev67"); \ | 144 | : amask (AMASK_CIX) ? "ev6" : "ev67"); \ |
| 145 | }) | 145 | }) |
| 146 | 146 | ||
| 147 | #define SET_PERSONALITY(EX, IBCS2) \ | 147 | #define SET_PERSONALITY(EX) \ |
| 148 | set_personality(((EX).e_flags & EF_ALPHA_32BIT) \ | 148 | set_personality(((EX).e_flags & EF_ALPHA_32BIT) \ |
| 149 | ? PER_LINUX_32BIT : (IBCS2) ? PER_SVR4 : PER_LINUX) | 149 | ? PER_LINUX_32BIT : PER_LINUX) |
| 150 | 150 | ||
| 151 | extern int alpha_l1i_cacheshape; | 151 | extern int alpha_l1i_cacheshape; |
| 152 | extern int alpha_l1d_cacheshape; | 152 | extern int alpha_l1d_cacheshape; |