summaryrefslogtreecommitdiffstats
path: root/include/asm-m68knommu/thread_info.h
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-01-12 14:47:08 -0800
committerSteve French <sfrench@us.ibm.com>2006-01-12 14:47:08 -0800
commit94bc2be31a01a3055ec94176e595dfe208e92d3b (patch)
treeebfbe81c6718a6390bfa1b99c6d228237d818576 /include/asm-m68knommu/thread_info.h
parentc32a0b689cb9cc160cfcd19735bbf50bb70c6ef4 (diff)
parent58cba4650a7a414eabd2b40cc9d8e45fcdf192d9 (diff)
downloadkernel-crypto-94bc2be31a01a3055ec94176e595dfe208e92d3b.tar.gz
kernel-crypto-94bc2be31a01a3055ec94176e595dfe208e92d3b.tar.xz
kernel-crypto-94bc2be31a01a3055ec94176e595dfe208e92d3b.zip
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'include/asm-m68knommu/thread_info.h')
-rw-r--r--include/asm-m68knommu/thread_info.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-m68knommu/thread_info.h b/include/asm-m68knommu/thread_info.h
index 7b9a3fa3af5..b8f009edf2b 100644
--- a/include/asm-m68knommu/thread_info.h
+++ b/include/asm-m68knommu/thread_info.h
@@ -75,8 +75,6 @@ static inline struct thread_info *current_thread_info(void)
#define alloc_thread_info(tsk) ((struct thread_info *) \
__get_free_pages(GFP_KERNEL, THREAD_SIZE_ORDER))
#define free_thread_info(ti) free_pages((unsigned long) (ti), THREAD_SIZE_ORDER)
-#define get_thread_info(ti) get_task_struct((ti)->task)
-#define put_thread_info(ti) put_task_struct((ti)->task)
#endif /* __ASSEMBLY__ */
#define PREEMPT_ACTIVE 0x4000000