diff options
Diffstat (limited to 'arch/powerpc/include')
-rw-r--r-- | arch/powerpc/include/asm/elf.h | 8 | ||||
-rw-r--r-- | arch/powerpc/include/asm/thread_info.h | 2 | ||||
-rw-r--r-- | arch/powerpc/include/asm/topology.h | 4 |
3 files changed, 5 insertions, 9 deletions
diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h index 17828ad411eb..c376eda15313 100644 --- a/arch/powerpc/include/asm/elf.h +++ b/arch/powerpc/include/asm/elf.h | |||
@@ -235,14 +235,10 @@ typedef elf_vrregset_t elf_fpxregset_t; | |||
235 | #ifdef __powerpc64__ | 235 | #ifdef __powerpc64__ |
236 | # define SET_PERSONALITY(ex) \ | 236 | # define SET_PERSONALITY(ex) \ |
237 | do { \ | 237 | do { \ |
238 | unsigned long new_flags = 0; \ | ||
239 | if ((ex).e_ident[EI_CLASS] == ELFCLASS32) \ | 238 | if ((ex).e_ident[EI_CLASS] == ELFCLASS32) \ |
240 | new_flags = _TIF_32BIT; \ | 239 | set_thread_flag(TIF_32BIT); \ |
241 | if ((current_thread_info()->flags & _TIF_32BIT) \ | ||
242 | != new_flags) \ | ||
243 | set_thread_flag(TIF_ABI_PENDING); \ | ||
244 | else \ | 240 | else \ |
245 | clear_thread_flag(TIF_ABI_PENDING); \ | 241 | clear_thread_flag(TIF_32BIT); \ |
246 | if (personality(current->personality) != PER_LINUX32) \ | 242 | if (personality(current->personality) != PER_LINUX32) \ |
247 | set_personality(PER_LINUX | \ | 243 | set_personality(PER_LINUX | \ |
248 | (current->personality & (~PER_MASK))); \ | 244 | (current->personality & (~PER_MASK))); \ |
diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h index c8b329255678..aa9d383a1c09 100644 --- a/arch/powerpc/include/asm/thread_info.h +++ b/arch/powerpc/include/asm/thread_info.h | |||
@@ -111,7 +111,6 @@ static inline struct thread_info *current_thread_info(void) | |||
111 | #define TIF_NOTIFY_RESUME 13 /* callback before returning to user */ | 111 | #define TIF_NOTIFY_RESUME 13 /* callback before returning to user */ |
112 | #define TIF_FREEZE 14 /* Freezing for suspend */ | 112 | #define TIF_FREEZE 14 /* Freezing for suspend */ |
113 | #define TIF_RUNLATCH 15 /* Is the runlatch enabled? */ | 113 | #define TIF_RUNLATCH 15 /* Is the runlatch enabled? */ |
114 | #define TIF_ABI_PENDING 16 /* 32/64 bit switch needed */ | ||
115 | 114 | ||
116 | /* as above, but as bit values */ | 115 | /* as above, but as bit values */ |
117 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) | 116 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) |
@@ -129,7 +128,6 @@ static inline struct thread_info *current_thread_info(void) | |||
129 | #define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME) | 128 | #define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME) |
130 | #define _TIF_FREEZE (1<<TIF_FREEZE) | 129 | #define _TIF_FREEZE (1<<TIF_FREEZE) |
131 | #define _TIF_RUNLATCH (1<<TIF_RUNLATCH) | 130 | #define _TIF_RUNLATCH (1<<TIF_RUNLATCH) |
132 | #define _TIF_ABI_PENDING (1<<TIF_ABI_PENDING) | ||
133 | #define _TIF_SYSCALL_T_OR_A (_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP) | 131 | #define _TIF_SYSCALL_T_OR_A (_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP) |
134 | 132 | ||
135 | #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \ | 133 | #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \ |
diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h index 22f738d12ad9..bbf89701d7a4 100644 --- a/arch/powerpc/include/asm/topology.h +++ b/arch/powerpc/include/asm/topology.h | |||
@@ -17,7 +17,9 @@ static inline int cpu_to_node(int cpu) | |||
17 | 17 | ||
18 | #define parent_node(node) (node) | 18 | #define parent_node(node) (node) |
19 | 19 | ||
20 | #define cpumask_of_node(node) (&numa_cpumask_lookup_table[node]) | 20 | #define cpumask_of_node(node) ((node) == -1 ? \ |
21 | cpu_all_mask : \ | ||
22 | &numa_cpumask_lookup_table[node]) | ||
21 | 23 | ||
22 | int of_node_to_nid(struct device_node *device); | 24 | int of_node_to_nid(struct device_node *device); |
23 | 25 | ||