projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'jwb/next' into next
[deliverable/linux.git]
/
arch
/
powerpc
/
include
/
asm
/
thread_info.h
diff --git
a/arch/powerpc/include/asm/thread_info.h
b/arch/powerpc/include/asm/thread_info.h
index 9665a26a253aaef0c118b644ec6635f96b84a83f..9aba5a38a7c4f32a011c6af5c3bd22e28e88d8a6 100644
(file)
--- a/
arch/powerpc/include/asm/thread_info.h
+++ b/
arch/powerpc/include/asm/thread_info.h
@@
-12,8
+12,10
@@
/* We have 8k stacks on ppc32 and 16k on ppc64 */
/* We have 8k stacks on ppc32 and 16k on ppc64 */
-#if
def CONFIG_PPC64
+#if
defined(CONFIG_PPC64)
#define THREAD_SHIFT 14
#define THREAD_SHIFT 14
+#elif defined(CONFIG_PPC_256K_PAGES)
+#define THREAD_SHIFT 15
#else
#define THREAD_SHIFT 13
#endif
#else
#define THREAD_SHIFT 13
#endif
@@
-154,6
+156,13
@@
static inline void set_restore_sigmask(void)
ti->local_flags |= _TLF_RESTORE_SIGMASK;
set_bit(TIF_SIGPENDING, &ti->flags);
}
ti->local_flags |= _TLF_RESTORE_SIGMASK;
set_bit(TIF_SIGPENDING, &ti->flags);
}
+
+#ifdef CONFIG_PPC64
+#define is_32bit_task() (test_thread_flag(TIF_32BIT))
+#else
+#define is_32bit_task() (1)
+#endif
+
#endif /* !__ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif /* !__ASSEMBLY__ */
#endif /* __KERNEL__ */
This page took
0.025438 seconds
and
5
git commands to generate.