I submitted this for 2.3.14, but didn't hear anything. Could someone give me a
'thumbs up' or a 'get bent'?
Removes pesky linux/tasks.h and replaces with linux/threads.h. There were 28
instances remaining in 2.3.15.
This patch has been tested on kernels 2.3.14 and 2.3.15, encompassing three
different computers using two different distros. All applications compiled
and worked. Tested only on i386. Could someone please apply
it to Sparc, Alpha and PPC just to make sure?
--To segfault is human, to blue screen is moronic... ~~~~~~~~~~~~ Matthew matthew@mattshouse.com http://www.mattshouse.com
--Boundary-=_nWlrBbmQBhCDarzOwKkYHIDdqSCD Content-Type: text/x-c; name="removetasks.diff" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="removetasks.diff"
diff -ur linux-2.3.14-clean/CREDITS linux/CREDITS --- linux-2.3.14-clean/CREDITS Thu Aug 12 13:49:02 1999 +++ linux/CREDITS Tue Aug 24 09:02:18 1999 @@ -377,6 +377,13 @@ S: Taiwan 251 S: Republic of China +N: Matthew Chappee +E: matthew@mattshouse.com +D: include/tasks.h -> include/threads.h +S: 315 Tolle Ln +S: Godfrey, Illinois 62035 +S: USA + N: Raymond Chen E: raymondc@microsoft.com D: Author of Configure script diff -ur linux-2.3.14-clean/arch/mips/kernel/head.S linux/arch/mips/kernel/head.S --- linux-2.3.14-clean/arch/mips/kernel/head.S Fri Jun 25 19:40:12 1999 +++ linux/arch/mips/kernel/head.S Tue Aug 24 08:54:22 1999 @@ -16,7 +16,7 @@ * Head.S contains the MIPS exception handler and startup code. */ #include <linux/config.h> -#include <linux/tasks.h> +#include <linux/threads.h> #include <asm/asm.h> #include <asm/cacheops.h> diff -ur linux-2.3.14-clean/arch/ppc/kernel/Makefile linux/arch/ppc/kernel/Makefile --- linux-2.3.14-clean/arch/ppc/kernel/Makefile Mon Jun 28 15:40:39 1999 +++ linux/arch/ppc/kernel/Makefile Tue Aug 24 08:54:56 1999 @@ -49,7 +49,7 @@ all: head.o kernel.o -head.o: head.S $(TOPDIR)/include/linux/tasks.h ppc_defs.h +head.o: head.S $(TOPDIR)/include/linux/threads.h ppc_defs.h ppc_defs.h: mk_defs.c ppc_defs.head \ $(TOPDIR)/include/asm/mmu.h \ diff -ur linux-2.3.14-clean/arch/ppc/kernel/smp.c linux/arch/ppc/kernel/smp.c --- linux-2.3.14-clean/arch/ppc/kernel/smp.c Thu Aug 12 13:50:14 1999 +++ linux/arch/ppc/kernel/smp.c Tue Aug 24 08:55:14 1999 @@ -12,7 +12,7 @@ #include <linux/kernel.h> #include <linux/sched.h> -#include <linux/tasks.h> +#include <linux/threads.h> #include <linux/smp.h> #include <linux/smp_lock.h> #include <linux/interrupt.h> diff -ur linux-2.3.14-clean/arch/sparc/ap1000/msc.c linux/arch/sparc/ap1000/msc.c --- linux-2.3.14-clean/arch/sparc/ap1000/msc.c Tue Aug 4 18:03:34 1998 +++ linux/arch/sparc/ap1000/msc.c Tue Aug 24 08:53:55 1999 @@ -17,7 +17,7 @@ #include <asm/irq.h> #include <asm/pgtable.h> #include <asm/ap1000/pgtapmmu.h> -#include <linux/tasks.h> +#include <linux/threads.h> #include <linux/sched.h> #include <linux/interrupt.h> diff -ur linux-2.3.14-clean/arch/sparc/ap1000/sync.c linux/arch/sparc/ap1000/sync.c --- linux-2.3.14-clean/arch/sparc/ap1000/sync.c Sun Jan 26 04:07:06 1997 +++ linux/arch/sparc/ap1000/sync.c Tue Aug 24 08:54:08 1999 @@ -10,7 +10,7 @@ #include <asm/ap1000/apreg.h> #include <linux/mm.h> #include <linux/sched.h> -#include <linux/tasks.h> +#include <linux/threads.h> extern int cap_cid0; extern unsigned _ncel, _ncelx, _ncely, _cid; diff -ur linux-2.3.14-clean/arch/sparc/kernel/cpu.c linux/arch/sparc/kernel/cpu.c --- linux-2.3.14-clean/arch/sparc/kernel/cpu.c Tue Apr 14 19:44:18 1998 +++ linux/arch/sparc/kernel/cpu.c Tue Aug 24 08:51:17 1999 @@ -7,7 +7,7 @@ #include <linux/kernel.h> #include <linux/init.h> #include <linux/smp.h> -#include <linux/tasks.h> +#include <linux/threads.h> #include <asm/oplib.h> #include <asm/page.h> #include <asm/head.h> diff -ur linux-2.3.14-clean/arch/sparc/kernel/devices.c linux/arch/sparc/kernel/devices.c --- linux-2.3.14-clean/arch/sparc/kernel/devices.c Wed Mar 10 18:53:36 1999 +++ linux/arch/sparc/kernel/devices.c Tue Aug 24 08:51:41 1999 @@ -5,7 +5,7 @@ */ #include <linux/kernel.h> -#include <linux/tasks.h> +#include <linux/threads.h> #include <linux/config.h> #include <linux/init.h> diff -ur linux-2.3.14-clean/arch/sparc/kernel/irq.c linux/arch/sparc/kernel/irq.c --- linux-2.3.14-clean/arch/sparc/kernel/irq.c Sat May 29 13:09:04 1999 +++ linux/arch/sparc/kernel/irq.c Tue Aug 24 08:50:58 1999 @@ -25,7 +25,7 @@ #include <linux/smp.h> #include <linux/smp_lock.h> #include <linux/delay.h> -#include <linux/tasks.h> +#include <linux/threads.h> #include <asm/ptrace.h> #include <asm/processor.h> diff -ur linux-2.3.14-clean/arch/sparc/kernel/smp.c linux/arch/sparc/kernel/smp.c --- linux-2.3.14-clean/arch/sparc/kernel/smp.c Wed Mar 10 18:53:36 1999 +++ linux/arch/sparc/kernel/smp.c Tue Aug 24 08:51:55 1999 @@ -8,7 +8,7 @@ #include <linux/kernel.h> #include <linux/sched.h> -#include <linux/tasks.h> +#include <linux/threads.h> #include <linux/smp.h> #include <linux/smp_lock.h> #include <linux/interrupt.h> diff -ur linux-2.3.14-clean/arch/sparc/kernel/sun4d_smp.c linux/arch/sparc/kernel/sun4d_smp.c --- linux-2.3.14-clean/arch/sparc/kernel/sun4d_smp.c Fri Jul 23 14:20:23 1999 +++ linux/arch/sparc/kernel/sun4d_smp.c Tue Aug 24 08:52:16 1999 @@ -11,7 +11,7 @@ #include <linux/config.h> #include <linux/kernel.h> #include <linux/sched.h> -#include <linux/tasks.h> +#include <linux/threads.h> #include <linux/smp.h> #include <linux/smp_lock.h> #include <linux/interrupt.h> diff -ur linux-2.3.14-clean/arch/sparc/kernel/sun4m_smp.c linux/arch/sparc/kernel/sun4m_smp.c --- linux-2.3.14-clean/arch/sparc/kernel/sun4m_smp.c Fri Jul 23 14:20:23 1999 +++ linux/arch/sparc/kernel/sun4m_smp.c Tue Aug 24 08:52:36 1999 @@ -7,7 +7,7 @@ #include <linux/kernel.h> #include <linux/sched.h> -#include <linux/tasks.h> +#include <linux/threads.h> #include <linux/smp.h> #include <linux/smp_lock.h> #include <linux/interrupt.h> diff -ur linux-2.3.14-clean/arch/sparc/lib/debuglocks.c linux/arch/sparc/lib/debuglocks.c --- linux-2.3.14-clean/arch/sparc/lib/debuglocks.c Fri Aug 6 13:58:00 1999 +++ linux/arch/sparc/lib/debuglocks.c Tue Aug 24 08:53:00 1999 @@ -7,7 +7,7 @@ #include <linux/kernel.h> #include <linux/sched.h> -#include <linux/tasks.h> /* For NR_CPUS */ +#include <linux/threads.h> /* For NR_CPUS */ #include <asm/psr.h> #include <asm/system.h> #include <asm/spinlock.h> diff -ur linux-2.3.14-clean/arch/sparc/mm/fault.c linux/arch/sparc/mm/fault.c --- linux-2.3.14-clean/arch/sparc/mm/fault.c Tue Aug 3 00:07:16 1999 +++ linux/arch/sparc/mm/fault.c Tue Aug 24 08:53:21 1999 @@ -12,7 +12,7 @@ #include <linux/types.h> #include <linux/ptrace.h> #include <linux/mman.h> -#include <linux/tasks.h> +#include <linux/threads.h> #include <linux/kernel.h> #include <linux/signal.h> #include <linux/mm.h> diff -ur linux-2.3.14-clean/arch/sparc64/kernel/devices.c linux/arch/sparc64/kernel/devices.c --- linux-2.3.14-clean/arch/sparc64/kernel/devices.c Tue Aug 3 00:07:16 1999 +++ linux/arch/sparc64/kernel/devices.c Tue Aug 24 08:55:29 1999 @@ -5,7 +5,7 @@ */ #include <linux/kernel.h> -#include <linux/tasks.h> +#include <linux/threads.h> #include <linux/init.h> #include <linux/ioport.h> diff -ur linux-2.3.14-clean/arch/sparc64/kernel/smp.c linux/arch/sparc64/kernel/smp.c --- linux-2.3.14-clean/arch/sparc64/kernel/smp.c Tue Aug 3 00:07:16 1999 +++ linux/arch/sparc64/kernel/smp.c Tue Aug 24 08:55:46 1999 @@ -7,7 +7,7 @@ #include <linux/sched.h> #include <linux/mm.h> #include <linux/pagemap.h> -#include <linux/tasks.h> +#include <linux/threads.h> #include <linux/smp.h> #include <linux/smp_lock.h> #include <linux/interrupt.h> diff -ur linux-2.3.14-clean/include/asm-alpha/smp.h linux/include/asm-alpha/smp.h --- linux-2.3.14-clean/include/asm-alpha/smp.h Mon Aug 16 12:33:58 1999 +++ linux/include/asm-alpha/smp.h Tue Aug 24 08:56:34 1999 @@ -19,7 +19,7 @@ #ifdef __SMP__ -#include <linux/tasks.h> +#include <linux/threads.h> struct cpuinfo_alpha { unsigned long loops_per_sec; diff -ur linux-2.3.14-clean/include/asm-arm/hardirq.h linux/include/asm-arm/hardirq.h --- linux-2.3.14-clean/include/asm-arm/hardirq.h Mon Jul 19 15:12:47 1999 +++ linux/include/asm-arm/hardirq.h Tue Aug 24 08:59:23 1999 @@ -1,7 +1,7 @@ #ifndef __ASM_HARDIRQ_H #define __ASM_HARDIRQ_H -#include <linux/tasks.h> +#include <linux/threads.h> extern unsigned int local_irq_count[NR_CPUS]; diff -ur linux-2.3.14-clean/include/asm-mips/hardirq.h linux/include/asm-mips/hardirq.h --- linux-2.3.14-clean/include/asm-mips/hardirq.h Mon Jul 19 15:12:47 1999 +++ linux/include/asm-mips/hardirq.h Tue Aug 24 08:56:17 1999 @@ -9,7 +9,7 @@ #ifndef __ASM_MIPS_HARDIRQ_H #define __ASM_MIPS_HARDIRQ_H -#include <linux/tasks.h> +#include <linux/threads.h> extern unsigned int local_irq_count[NR_CPUS]; diff -ur linux-2.3.14-clean/include/asm-ppc/smp.h linux/include/asm-ppc/smp.h --- linux-2.3.14-clean/include/asm-ppc/smp.h Mon Jul 19 15:12:47 1999 +++ linux/include/asm-ppc/smp.h Tue Aug 24 08:58:49 1999 @@ -7,7 +7,7 @@ #define _PPC_SMP_H #include <linux/kernel.h> -#include <linux/tasks.h> +#include <linux/threads.h> #ifdef __SMP__ diff -ur linux-2.3.14-clean/include/asm-sparc/ap1000/apreg.h linux/include/asm-sparc/ap1000/apreg.h --- linux-2.3.14-clean/include/asm-sparc/ap1000/apreg.h Sun Jan 26 04:07:47 1997 +++ linux/include/asm-sparc/ap1000/apreg.h Tue Aug 24 08:57:27 1999 @@ -12,7 +12,7 @@ #include <asm/page.h> #include <asm/ap1000/apservice.h> #include <asm/ap1000/apbif.h> -#include <linux/tasks.h> +#include <linux/threads.h> /* * Macros for accessing I/O registers. diff -ur linux-2.3.14-clean/include/asm-sparc/hardirq.h linux/include/asm-sparc/hardirq.h --- linux-2.3.14-clean/include/asm-sparc/hardirq.h Mon Jul 19 15:12:47 1999 +++ linux/include/asm-sparc/hardirq.h Tue Aug 24 08:57:41 1999 @@ -7,7 +7,7 @@ #ifndef __SPARC_HARDIRQ_H #define __SPARC_HARDIRQ_H -#include <linux/tasks.h> +#include <linux/threads.h> #ifndef __SMP__ extern unsigned int local_irq_count; diff -ur linux-2.3.14-clean/include/asm-sparc/irq.h linux/include/asm-sparc/irq.h --- linux-2.3.14-clean/include/asm-sparc/irq.h Mon Jul 19 15:12:47 1999 +++ linux/include/asm-sparc/irq.h Tue Aug 24 08:56:49 1999 @@ -8,7 +8,7 @@ #define _SPARC_IRQ_H #include <linux/linkage.h> -#include <linux/tasks.h> /* For NR_CPUS */ +#include <linux/threads.h> /* For NR_CPUS */ #include <asm/system.h> /* For SUN4M_NCPUS */ #include <asm/btfixup.h> diff -ur linux-2.3.14-clean/include/asm-sparc/smp.h linux/include/asm-sparc/smp.h --- linux-2.3.14-clean/include/asm-sparc/smp.h Mon Jul 19 15:12:47 1999 +++ linux/include/asm-sparc/smp.h Tue Aug 24 08:57:10 1999 @@ -6,7 +6,7 @@ #ifndef _SPARC_SMP_H #define _SPARC_SMP_H -#include <linux/tasks.h> +#include <linux/threads.h> #include <asm/head.h> #include <asm/btfixup.h> diff -ur linux-2.3.14-clean/include/asm-sparc/softirq.h linux/include/asm-sparc/softirq.h --- linux-2.3.14-clean/include/asm-sparc/softirq.h Mon Jul 19 15:12:47 1999 +++ linux/include/asm-sparc/softirq.h Tue Aug 24 08:58:36 1999 @@ -7,7 +7,7 @@ #ifndef __SPARC_SOFTIRQ_H #define __SPARC_SOFTIRQ_H -#include <linux/tasks.h> /* For NR_CPUS */ +#include <linux/threads.h> /* For NR_CPUS */ #include <asm/atomic.h> #include <asm/smp.h> diff -ur linux-2.3.14-clean/include/asm-sparc/spinlock.h linux/include/asm-sparc/spinlock.h --- linux-2.3.14-clean/include/asm-sparc/spinlock.h Mon Jul 19 15:12:47 1999 +++ linux/include/asm-sparc/spinlock.h Tue Aug 24 08:57:56 1999 @@ -6,7 +6,7 @@ #ifndef __SPARC_SPINLOCK_H #define __SPARC_SPINLOCK_H -#include <linux/tasks.h> /* For NR_CPUS */ +#include <linux/threads.h> /* For NR_CPUS */ #ifndef __ASSEMBLY__ diff -ur linux-2.3.14-clean/include/asm-sparc64/hardirq.h linux/include/asm-sparc64/hardirq.h --- linux-2.3.14-clean/include/asm-sparc64/hardirq.h Mon Jul 19 15:12:47 1999 +++ linux/include/asm-sparc64/hardirq.h Tue Aug 24 08:59:03 1999 @@ -6,7 +6,7 @@ #ifndef __SPARC64_HARDIRQ_H #define __SPARC64_HARDIRQ_H -#include <linux/tasks.h> +#include <linux/threads.h> #ifndef __SMP__ extern unsigned int local_irq_count; Only in linux-2.3.14-clean/: matt.diff
--Boundary-=_nWlrBbmQBhCDarzOwKkYHIDdqSCD--
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/