From: Al Viro {get,put}_thread_info() were introduced in 2.5.4 and never had been called by anything in the tree. Signed-off-by: Al Viro Signed-off-by: Andrew Morton --- include/asm-alpha/thread_info.h | 2 -- include/asm-arm/thread_info.h | 3 --- include/asm-arm26/thread_info.h | 3 --- include/asm-cris/thread_info.h | 2 -- include/asm-frv/thread_info.h | 2 -- include/asm-h8300/thread_info.h | 2 -- include/asm-i386/thread_info.h | 2 -- include/asm-m32r/thread_info.h | 2 -- include/asm-m68knommu/thread_info.h | 2 -- include/asm-mips/thread_info.h | 2 -- include/asm-parisc/thread_info.h | 3 --- include/asm-powerpc/thread_info.h | 3 --- include/asm-s390/thread_info.h | 2 -- include/asm-sh/thread_info.h | 2 -- include/asm-sh64/thread_info.h | 2 -- include/asm-sparc/thread_info.h | 3 --- include/asm-um/thread_info.h | 3 --- include/asm-v850/thread_info.h | 2 -- include/asm-x86_64/thread_info.h | 2 -- include/asm-xtensa/thread_info.h | 2 -- 20 files changed, 46 deletions(-) diff -puN include/asm-alpha/thread_info.h~death-of-get_thread_info-put_thread_info include/asm-alpha/thread_info.h --- devel/include/asm-alpha/thread_info.h~death-of-get_thread_info-put_thread_info 2006-01-04 22:03:17.000000000 -0800 +++ devel-akpm/include/asm-alpha/thread_info.h 2006-01-04 22:03:17.000000000 -0800 @@ -54,8 +54,6 @@ register struct thread_info *__current_t #define alloc_thread_info(tsk) \ ((struct thread_info *) __get_free_pages(GFP_KERNEL,1)) #define free_thread_info(ti) free_pages((unsigned long) (ti), 1) -#define get_thread_info(ti) get_task_struct((ti)->task) -#define put_thread_info(ti) put_task_struct((ti)->task) #endif /* __ASSEMBLY__ */ diff -puN include/asm-arm26/thread_info.h~death-of-get_thread_info-put_thread_info include/asm-arm26/thread_info.h --- devel/include/asm-arm26/thread_info.h~death-of-get_thread_info-put_thread_info 2006-01-04 22:03:17.000000000 -0800 +++ devel-akpm/include/asm-arm26/thread_info.h 2006-01-04 22:03:17.000000000 -0800 @@ -87,9 +87,6 @@ static inline struct thread_info *curren extern struct thread_info *alloc_thread_info(struct task_struct *task); extern void free_thread_info(struct thread_info *); -#define get_thread_info(ti) get_task_struct((ti)->task) -#define put_thread_info(ti) put_task_struct((ti)->task) - #define thread_saved_pc(tsk) \ ((unsigned long)(pc_pointer(task_thread_info(tsk)->cpu_context.pc))) #define thread_saved_fp(tsk) \ diff -puN include/asm-arm/thread_info.h~death-of-get_thread_info-put_thread_info include/asm-arm/thread_info.h --- devel/include/asm-arm/thread_info.h~death-of-get_thread_info-put_thread_info 2006-01-04 22:03:17.000000000 -0800 +++ devel-akpm/include/asm-arm/thread_info.h 2006-01-04 22:03:17.000000000 -0800 @@ -96,9 +96,6 @@ static inline struct thread_info *curren extern struct thread_info *alloc_thread_info(struct task_struct *task); extern void free_thread_info(struct thread_info *); -#define get_thread_info(ti) get_task_struct((ti)->task) -#define put_thread_info(ti) put_task_struct((ti)->task) - #define thread_saved_pc(tsk) \ ((unsigned long)(pc_pointer(task_thread_info(tsk)->cpu_context.pc))) #define thread_saved_fp(tsk) \ diff -puN include/asm-cris/thread_info.h~death-of-get_thread_info-put_thread_info include/asm-cris/thread_info.h --- devel/include/asm-cris/thread_info.h~death-of-get_thread_info-put_thread_info 2006-01-04 22:03:17.000000000 -0800 +++ devel-akpm/include/asm-cris/thread_info.h 2006-01-04 22:03:17.000000000 -0800 @@ -69,8 +69,6 @@ struct thread_info { /* thread information allocation */ #define alloc_thread_info(tsk) ((struct thread_info *) __get_free_pages(GFP_KERNEL,1)) #define free_thread_info(ti) free_pages((unsigned long) (ti), 1) -#define get_thread_info(ti) get_task_struct((ti)->task) -#define put_thread_info(ti) put_task_struct((ti)->task) #endif /* !__ASSEMBLY__ */ diff -puN include/asm-frv/thread_info.h~death-of-get_thread_info-put_thread_info include/asm-frv/thread_info.h --- devel/include/asm-frv/thread_info.h~death-of-get_thread_info-put_thread_info 2006-01-04 22:03:17.000000000 -0800 +++ devel-akpm/include/asm-frv/thread_info.h 2006-01-04 22:03:17.000000000 -0800 @@ -110,8 +110,6 @@ register struct thread_info *__current_t #endif #define free_thread_info(info) kfree(info) -#define get_thread_info(ti) get_task_struct((ti)->task) -#define put_thread_info(ti) put_task_struct((ti)->task) #else /* !__ASSEMBLY__ */ diff -puN include/asm-h8300/thread_info.h~death-of-get_thread_info-put_thread_info include/asm-h8300/thread_info.h --- devel/include/asm-h8300/thread_info.h~death-of-get_thread_info-put_thread_info 2006-01-04 22:03:17.000000000 -0800 +++ devel-akpm/include/asm-h8300/thread_info.h 2006-01-04 22:03:17.000000000 -0800 @@ -69,8 +69,6 @@ static inline struct thread_info *curren #define alloc_thread_info(tsk) ((struct thread_info *) \ __get_free_pages(GFP_KERNEL, 1)) #define free_thread_info(ti) free_pages((unsigned long) (ti), 1) -#define get_thread_info(ti) get_task_struct((ti)->task) -#define put_thread_info(ti) put_task_struct((ti)->task) #endif /* __ASSEMBLY__ */ /* diff -puN include/asm-i386/thread_info.h~death-of-get_thread_info-put_thread_info include/asm-i386/thread_info.h --- devel/include/asm-i386/thread_info.h~death-of-get_thread_info-put_thread_info 2006-01-04 22:03:17.000000000 -0800 +++ devel-akpm/include/asm-i386/thread_info.h 2006-01-04 22:03:17.000000000 -0800 @@ -111,8 +111,6 @@ register unsigned long current_stack_poi #endif #define free_thread_info(info) kfree(info) -#define get_thread_info(ti) get_task_struct((ti)->task) -#define put_thread_info(ti) put_task_struct((ti)->task) #else /* !__ASSEMBLY__ */ diff -puN include/asm-m32r/thread_info.h~death-of-get_thread_info-put_thread_info include/asm-m32r/thread_info.h --- devel/include/asm-m32r/thread_info.h~death-of-get_thread_info-put_thread_info 2006-01-04 22:03:17.000000000 -0800 +++ devel-akpm/include/asm-m32r/thread_info.h 2006-01-04 22:03:17.000000000 -0800 @@ -110,8 +110,6 @@ static inline struct thread_info *curren #endif #define free_thread_info(info) kfree(info) -#define get_thread_info(ti) get_task_struct((ti)->task) -#define put_thread_info(ti) put_task_struct((ti)->task) #define TI_FLAG_FAULT_CODE_SHIFT 28 diff -puN include/asm-m68knommu/thread_info.h~death-of-get_thread_info-put_thread_info include/asm-m68knommu/thread_info.h --- devel/include/asm-m68knommu/thread_info.h~death-of-get_thread_info-put_thread_info 2006-01-04 22:03:17.000000000 -0800 +++ devel-akpm/include/asm-m68knommu/thread_info.h 2006-01-04 22:03:17.000000000 -0800 @@ -75,8 +75,6 @@ static inline struct thread_info *curren #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 diff -puN include/asm-mips/thread_info.h~death-of-get_thread_info-put_thread_info include/asm-mips/thread_info.h --- devel/include/asm-mips/thread_info.h~death-of-get_thread_info-put_thread_info 2006-01-04 22:03:17.000000000 -0800 +++ devel-akpm/include/asm-mips/thread_info.h 2006-01-04 22:03:17.000000000 -0800 @@ -97,8 +97,6 @@ register struct thread_info *__current_t #endif #define free_thread_info(info) kfree(info) -#define get_thread_info(ti) get_task_struct((ti)->task) -#define put_thread_info(ti) put_task_struct((ti)->task) #endif /* !__ASSEMBLY__ */ diff -puN include/asm-parisc/thread_info.h~death-of-get_thread_info-put_thread_info include/asm-parisc/thread_info.h --- devel/include/asm-parisc/thread_info.h~death-of-get_thread_info-put_thread_info 2006-01-04 22:03:17.000000000 -0800 +++ devel-akpm/include/asm-parisc/thread_info.h 2006-01-04 22:03:17.000000000 -0800 @@ -43,9 +43,6 @@ struct thread_info { #define alloc_thread_info(tsk) ((struct thread_info *) \ __get_free_pages(GFP_KERNEL, THREAD_ORDER)) #define free_thread_info(ti) free_pages((unsigned long) (ti), THREAD_ORDER) -#define get_thread_info(ti) get_task_struct((ti)->task) -#define put_thread_info(ti) put_task_struct((ti)->task) - /* how to get the thread information struct from C */ #define current_thread_info() ((struct thread_info *)mfctl(30)) diff -puN include/asm-powerpc/thread_info.h~death-of-get_thread_info-put_thread_info include/asm-powerpc/thread_info.h --- devel/include/asm-powerpc/thread_info.h~death-of-get_thread_info-put_thread_info 2006-01-04 22:03:17.000000000 -0800 +++ devel-akpm/include/asm-powerpc/thread_info.h 2006-01-04 22:03:17.000000000 -0800 @@ -89,9 +89,6 @@ struct thread_info { #endif /* THREAD_SHIFT < PAGE_SHIFT */ -#define get_thread_info(ti) get_task_struct((ti)->task) -#define put_thread_info(ti) put_task_struct((ti)->task) - /* how to get the thread information struct from C */ static inline struct thread_info *current_thread_info(void) { diff -puN include/asm-s390/thread_info.h~death-of-get_thread_info-put_thread_info include/asm-s390/thread_info.h --- devel/include/asm-s390/thread_info.h~death-of-get_thread_info-put_thread_info 2006-01-04 22:03:17.000000000 -0800 +++ devel-akpm/include/asm-s390/thread_info.h 2006-01-04 22:03:17.000000000 -0800 @@ -81,8 +81,6 @@ static inline struct thread_info *curren #define alloc_thread_info(tsk) ((struct thread_info *) \ __get_free_pages(GFP_KERNEL,THREAD_ORDER)) #define free_thread_info(ti) free_pages((unsigned long) (ti),THREAD_ORDER) -#define get_thread_info(ti) get_task_struct((ti)->task) -#define put_thread_info(ti) put_task_struct((ti)->task) #endif diff -puN include/asm-sh64/thread_info.h~death-of-get_thread_info-put_thread_info include/asm-sh64/thread_info.h --- devel/include/asm-sh64/thread_info.h~death-of-get_thread_info-put_thread_info 2006-01-04 22:03:17.000000000 -0800 +++ devel-akpm/include/asm-sh64/thread_info.h 2006-01-04 22:03:17.000000000 -0800 @@ -66,8 +66,6 @@ static inline struct thread_info *curren #define alloc_thread_info(ti) ((struct thread_info *) __get_free_pages(GFP_KERNEL,1)) #define free_thread_info(ti) free_pages((unsigned long) (ti), 1) -#define get_thread_info(ti) get_task_struct((ti)->task) -#define put_thread_info(ti) put_task_struct((ti)->task) #endif /* __ASSEMBLY__ */ diff -puN include/asm-sh/thread_info.h~death-of-get_thread_info-put_thread_info include/asm-sh/thread_info.h --- devel/include/asm-sh/thread_info.h~death-of-get_thread_info-put_thread_info 2006-01-04 22:03:17.000000000 -0800 +++ devel-akpm/include/asm-sh/thread_info.h 2006-01-04 22:03:17.000000000 -0800 @@ -60,8 +60,6 @@ static inline struct thread_info *curren #define THREAD_SIZE (2*PAGE_SIZE) #define alloc_thread_info(ti) ((struct thread_info *) __get_free_pages(GFP_KERNEL,1)) #define free_thread_info(ti) free_pages((unsigned long) (ti), 1) -#define get_thread_info(ti) get_task_struct((ti)->task) -#define put_thread_info(ti) put_task_struct((ti)->task) #else /* !__ASSEMBLY__ */ diff -puN include/asm-sparc/thread_info.h~death-of-get_thread_info-put_thread_info include/asm-sparc/thread_info.h --- devel/include/asm-sparc/thread_info.h~death-of-get_thread_info-put_thread_info 2006-01-04 22:03:17.000000000 -0800 +++ devel-akpm/include/asm-sparc/thread_info.h 2006-01-04 22:03:17.000000000 -0800 @@ -92,9 +92,6 @@ BTFIXUPDEF_CALL(struct thread_info *, al BTFIXUPDEF_CALL(void, free_thread_info, struct thread_info *) #define free_thread_info(ti) BTFIXUP_CALL(free_thread_info)(ti) -#define get_thread_info(ti) get_task_struct((ti)->task) -#define put_thread_info(ti) put_task_struct((ti)->task) - #endif /* __ASSEMBLY__ */ /* diff -puN include/asm-um/thread_info.h~death-of-get_thread_info-put_thread_info include/asm-um/thread_info.h --- devel/include/asm-um/thread_info.h~death-of-get_thread_info-put_thread_info 2006-01-04 22:03:17.000000000 -0800 +++ devel-akpm/include/asm-um/thread_info.h 2006-01-04 22:03:17.000000000 -0800 @@ -56,9 +56,6 @@ static inline struct thread_info *curren ((struct thread_info *) kmalloc(THREAD_SIZE, GFP_KERNEL)) #define free_thread_info(ti) kfree(ti) -#define get_thread_info(ti) get_task_struct((ti)->task) -#define put_thread_info(ti) put_task_struct((ti)->task) - #endif #define PREEMPT_ACTIVE 0x10000000 diff -puN include/asm-v850/thread_info.h~death-of-get_thread_info-put_thread_info include/asm-v850/thread_info.h --- devel/include/asm-v850/thread_info.h~death-of-get_thread_info-put_thread_info 2006-01-04 22:03:17.000000000 -0800 +++ devel-akpm/include/asm-v850/thread_info.h 2006-01-04 22:03:17.000000000 -0800 @@ -58,8 +58,6 @@ struct thread_info { #define alloc_thread_info(tsk) ((struct thread_info *) \ __get_free_pages(GFP_KERNEL, 1)) #define free_thread_info(ti) free_pages((unsigned long) (ti), 1) -#define get_thread_info(ti) get_task_struct((ti)->task) -#define put_thread_info(ti) put_task_struct((ti)->task) #endif /* __ASSEMBLY__ */ diff -puN include/asm-x86_64/thread_info.h~death-of-get_thread_info-put_thread_info include/asm-x86_64/thread_info.h --- devel/include/asm-x86_64/thread_info.h~death-of-get_thread_info-put_thread_info 2006-01-04 22:03:17.000000000 -0800 +++ devel-akpm/include/asm-x86_64/thread_info.h 2006-01-04 22:03:17.000000000 -0800 @@ -76,8 +76,6 @@ static inline struct thread_info *stack_ #define alloc_thread_info(tsk) \ ((struct thread_info *) __get_free_pages(GFP_KERNEL,THREAD_ORDER)) #define free_thread_info(ti) free_pages((unsigned long) (ti), THREAD_ORDER) -#define get_thread_info(ti) get_task_struct((ti)->task) -#define put_thread_info(ti) put_task_struct((ti)->task) #else /* !__ASSEMBLY__ */ diff -puN include/asm-xtensa/thread_info.h~death-of-get_thread_info-put_thread_info include/asm-xtensa/thread_info.h --- devel/include/asm-xtensa/thread_info.h~death-of-get_thread_info-put_thread_info 2006-01-04 22:03:17.000000000 -0800 +++ devel-akpm/include/asm-xtensa/thread_info.h 2006-01-04 22:03:17.000000000 -0800 @@ -93,8 +93,6 @@ static inline struct thread_info *curren /* thread information allocation */ #define alloc_thread_info(tsk) ((struct thread_info *) __get_free_pages(GFP_KERNEL,1)) #define free_thread_info(ti) free_pages((unsigned long) (ti), 1) -#define get_thread_info(ti) get_task_struct((ti)->task) -#define put_thread_info(ti) put_task_struct((ti)->task) #else /* !__ASSEMBLY__ */ _