linux-vax-k25-commit — Notifications of CVS commits to kernel 2.5 tree

[LV-k25-commit] CVS: kernel-2.5/drivers Makefile,1.5,1.6

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers
In directory sc8-pr-cvs1:/tmp/cvs-serv11452

Modified Files:
	Makefile 
Log Message:
2.5.5 merges


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile	29 Oct 2002 00:52:50 -0000	1.5
+++ Makefile	2 Dec 2002 00:03:42 -0000	1.6
@@ -10,7 +10,7 @@
 		message/i2o message/fusion scsi md ieee1394 pnp isdn atm \
 		fc4 net/hamradio i2c acpi bluetooth input/serio input/gameport
 
-subdir-y :=	base parport char block net sound misc media cdrom hotplug
+subdir-y :=	base parport char block net misc media cdrom hotplug
 subdir-m :=	$(subdir-y)
 
 

[LV-k25-commit] CVS: kernel-2.5/arch/vax/mm init.c,1.5,1.6

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/mm
In directory sc8-pr-cvs1:/tmp/cvs-serv9359

Modified Files:
	init.c 
Log Message:
2.5.5 no longer maintains lookaside lists for page table pages.


Index: init.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/mm/init.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- init.c	31 May 2002 01:58:38 -0000	1.5
+++ init.c	2 Dec 2002 00:00:23 -0000	1.6
@@ -24,9 +24,7 @@
 
 pte_t *pg0;
 
-#ifndef CONFIG_SMP
-struct pgtable_cache_struct quicklists;
-#endif
+struct pgd_cache pgd_free_list;
 
 
 
@@ -86,9 +84,6 @@
     flush_tlb();
 
     printk("VAXMM: system page table base %8lx, length (bytes) %8lx length (ptes) %8lx\n",SPT_BASE,SPT_SIZE,SPT_LEN);
-    
-    /* clear the quicklists structure */
-    memset(&quicklists,0,sizeof(quicklists));
 }
 
 #if DEBUG_POISON
@@ -173,7 +168,7 @@
 	printk("%ld reserved pages\n",reserved);
 	printk("%ld pages shared\n",shared);
 	printk("%ld pages swap cached\n",cached);
-	printk("%ld pages in page table cache\n",pgtable_cache_size);
+	printk("%ld pages in PGD cache\n",pgd_free_list.size);
 	show_buffers();
 }
 
@@ -202,31 +197,5 @@
     val->freehigh = 0;
     val->mem_unit = PAGE_SIZE;
     return;
-}
-
-/* 
- * atp Mar 2002.
- * The pmd cache is now separate, as it is a two page block of 
- * memory. ptes are 1 page.  I'd like to separate the pmd from the 
- * pgtable_cache_sz. Later.
- */
-int do_check_pgt_cache(int low, int high)
-{
-  int freed = 0;
-   
-  if(pgtable_cache_size > high) {
-    do {
-//      if(pmd_quicklist) {
-//	free_pmd_slow(pmd_alloc_one_fast(NULL, 0));
-//	 freed++;
-//	 freed++;   /* a two page block */
-//      }    
-      if(pte_quicklist){
-         free_pte_slow(pte_alloc_one_fast(NULL,0));
-	 freed++;
-      }
-    } while(pgtable_cache_size > low);
-  }
-  return freed;
 }
 

[LV-k25-commit] CVS: kernel-2.5/arch/vax/lib console.c,1.4,1.5

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv8999

Modified Files:
	console.c 
Log Message:
Switch to named initializers


Index: console.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/lib/console.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- console.c	20 May 2002 00:33:33 -0000	1.4
+++ console.c	1 Dec 2002 23:59:25 -0000	1.5
@@ -30,17 +30,9 @@
    series. */
 
 struct console vax_console = {
-   "VAXcons",
-   vaxcons_write,
-   NULL,            /* read */
-   NULL,            /* device */
-   NULL,            /* wait_key */
-   NULL,            /* unblank */
-   NULL,            /* setup */
-   CON_PRINTBUFFER, /* flags */
-   0,               /* index */
-   0,               /* cflag */
-   NULL,            /* next */
+	name:	"VAXcons",
+	write:	vaxcons_write,
+	flags:	CON_PRINTBUFFER,
 };
 
 static void vaxcons_write(struct console *cons, const char *s, unsigned int len)

[LV-k25-commit] CVS: kernel-2.5/arch/vax/kernel signal.c,1.4,1.5

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv8570

Modified Files:
	signal.c 
Log Message:
recalc_sigpending() no longer takes an argument in 2.5.5


Index: signal.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/signal.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- signal.c	31 May 2002 01:58:38 -0000	1.4
+++ signal.c	1 Dec 2002 23:58:45 -0000	1.5
@@ -28,6 +28,7 @@
 #include <linux/unistd.h>
 #include <linux/stddef.h>
 #include <linux/tty.h>
+#include <linux/binfmts.h>
 
 #include <asm/processor.h>
 #include <asm/ucontext.h>
@@ -90,7 +91,7 @@
 	spin_lock_irq(&current->sigmask_lock);
 	saveset = current->blocked;
 	siginitset(&current->blocked, mask);
-	recalc_sigpending(current);
+	recalc_sigpending();
 	spin_unlock_irq(&current->sigmask_lock);
 
 	regs->r0 = -EINTR;
@@ -124,7 +125,7 @@
 	spin_lock_irq(&current->sigmask_lock);
 	saveset = current->blocked;
 	current->blocked = newset;
-	recalc_sigpending(current);
+	recalc_sigpending();
 	spin_unlock_irq(&current->sigmask_lock);
 
 	regs->r0 = -EINTR;
@@ -255,7 +256,7 @@
 	sigdelsetmask(&set, ~_BLOCKABLE);
 	spin_lock_irq(&current->sigmask_lock);
 	current->blocked = set;
-	recalc_sigpending(current);
+	recalc_sigpending();
 	spin_unlock_irq(&current->sigmask_lock);
 	
 	if (restore_sigcontext(regs, &frame->sc))
@@ -296,7 +297,7 @@
 	sigdelsetmask(&set, ~_BLOCKABLE);
 	spin_lock_irq(&current->sigmask_lock);
 	current->blocked = set;
-	recalc_sigpending(current);
+	recalc_sigpending();
 	spin_unlock_irq(&current->sigmask_lock);
 	
 	if (restore_sigcontext(regs, &frame->uc.uc_mcontext))
@@ -634,7 +635,7 @@
 		spin_lock_irq(&current->sigmask_lock);
 		sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
 		sigaddset(&current->blocked,sig);
-		recalc_sigpending(current);
+		recalc_sigpending();
 		spin_unlock_irq(&current->sigmask_lock);
 	}
 }
@@ -760,7 +761,7 @@
 			default:
 				//lock_kernel();
 				sigaddset(&current->pending.signal, signr);
-				recalc_sigpending(current);
+				recalc_sigpending();
 				current->flags |= PF_SIGNALED;
 #ifdef DEBUG_SIG		   			   
 			        printk("handle_sig: do_exit exit_code=%d\n",exit_code);

[LV-k25-commit] CVS: kernel-2.5/arch/vax/kernel process.c,1.7,1.8

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv7720

Modified Files:
	process.c 
Log Message:
switch_to no longer needs to return the last task.  Also drop call to
check_pgt_cache from idle loop, since 2.5.5 no longer maintains page
table lookaside lists.


Index: process.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/process.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- process.c	29 Oct 2002 00:52:50 -0000	1.7
+++ process.c	1 Dec 2002 23:58:04 -0000	1.8
@@ -11,6 +11,7 @@
 
 #include <linux/smp_lock.h>
 #include <linux/fs.h>
+#include <linux/mm.h>
 #include <linux/slab.h>
 #include <asm/uaccess.h>
 #include <asm/current.h>
@@ -29,24 +30,20 @@
 void cpu_idle(void)
 {
 	/* endless idle loop with no priority at all */
-	current->__nice = 20;
 
 	while(1) {
 		/* Although we are an idle CPU, we do not want to 
 		   get into the scheduler unnecessarily.  */
 		if (need_resched()) {
 			schedule();
-			check_pgt_cache();
 		}
 	}
 }
 
 
-struct task_struct* 
-vax_switch_to(struct task_struct* prev, struct task_struct* next)
+void switch_to(struct task_struct* prev, struct task_struct* next)
 {
         unsigned long pcbb; 	/* physical address of new pcb */
-	struct task_struct *retval;
 
 #ifdef VAX_PROCESS_DEBUG
 	printk("vax_switch_to: switching %08lx -> %08lx\n",
@@ -60,24 +57,20 @@
    
         /* svpctx should deal with writing the stuff into *prev */
         
-	asm("	movl %1, r11	\n
-		movpsl -(sp)	\n
+	asm("   movpsl -(sp)	\n
 		pushab 1f	\n
-		mtpr %4,%5	\n
+		mtpr %3, %4	\n
 		svpctx          \n
-		mtpr %2, %3	\n
+		mtpr %1, %2	\n
 		ldpctx          \n
 		rei		\n
-	     1:			\n
-		movl r11, %0"
-                : "=g"(retval)
+	     1:			"
+                : /* no outputs */
                 : "g"(prev),
 		  "r"(pcbb), "g"(PR_PCBB),
 		  "g"(31), "g"(PR_IPL)
-		: "r11"
+		/* no clobbers */
 	    );
-        
-	return retval;
 }
 
 /* This _must_ match the stack layout in effect at ret_from_syscall

[LV-k25-commit] CVS: kernel-2.5/include/asm-vax system.h,1.3,1.4

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax
In directory sc8-pr-cvs1:/tmp/cvs-serv6948

Modified Files:
	system.h 
Log Message:
switch_to() no longer needs to return the last task


Index: system.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/system.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- system.h	20 May 2002 00:33:39 -0000	1.3
+++ system.h	1 Dec 2002 23:56:26 -0000	1.4
@@ -35,17 +35,7 @@
 
 struct task_struct;	/* one of the stranger aspects of C forward declarations.. */
 
-
-#define switch_to(prev,next,last)			\
-do {							\
-	if ((prev) == (next)) {                         \
-		(last) = (prev);                        \
-	} else {                                        \
-		(last) = vax_switch_to((prev), (next)); \
-	}                                               \
-} while (0)
-
-extern struct task_struct* vax_switch_to(struct task_struct*, struct task_struct*);
+extern void switch_to(struct task_struct*, struct task_struct*);
 
 /* mb is the alpha instruction to cause serialisation of memory
    operations. According to a software note in section 5.5.4 of 

[LV-k25-commit] CVS: kernel-2.5/include/asm-vax bitops.h,1.5,1.6 mmu_context.h,1.5,1.6

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax
In directory sc8-pr-cvs1:/tmp/cvs-serv6058

Modified Files:
	bitops.h mmu_context.h 
Log Message:
sched_find_first_bit moved from mmu_context.h to bitops.h in 2.5.5


Index: bitops.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/bitops.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bitops.h	6 Jun 2002 00:06:11 -0000	1.5
+++ bitops.h	1 Dec 2002 23:54:43 -0000	1.6
@@ -6,6 +6,7 @@
  */
 
 #include <linux/config.h>
+#include <linux/compiler.h>
 
 /*
  * These have to be done with inline assembly: that way the bit-setting
@@ -356,6 +357,28 @@
 }
 
 #ifdef __KERNEL__
+
+ /*
+ * Every architecture must define this function. It's the fastest
+ * way of searching a 168-bit bitmap where the first 100 bits are
+ * unlikely to be set. It's guaranteed that at least one of the 140
+ * bits is set.
+ */
+
+static inline int sched_find_first_bit(unsigned long *b)
+{
+        if (unlikely(b[0]))
+                return __ffs(b[0]);
+        if (unlikely(b[1]))
+                return __ffs(b[1]) + 32;
+        if (unlikely(b[2]))
+                return __ffs(b[2]) + 64;
+        if (b[3])
+                return __ffs(b[3]) + 96;
+        return __ffs(b[4]) + 128;
+}
+
+
 /**
  * ffs - find first bit set
  * @x: the word to search

Index: mmu_context.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/mmu_context.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mmu_context.h	6 Jun 2002 00:07:33 -0000	1.5
+++ mmu_context.h	1 Dec 2002 23:54:43 -0000	1.6
@@ -3,33 +3,4 @@
 
 #include <asm/mm/mmu_context.h>
 
-/* This was introduced in 2.5.2 and for some strange reason, was
-   implemented in this header file for i386/sparc/sparc64. */
-
- /*
- * Every architecture must define this function. It's the fastest
- * way of searching a 168-bit bitmap where the first 128 bits are
- * unlikely to be set. It's guaranteed that at least one of the 168
- * bits is cleared.
- */
-#if MAX_RT_PRIO != 128 || MAX_PRIO != 168
-# error update this function.
-#endif
-
-static inline int sched_find_first_bit(unsigned long *b)
-{
-	if (unlikely(b[0]))
-		return __ffs(b[0]);
-	if (unlikely(b[1]))
-		return __ffs(b[1]) + 32;
-	if (unlikely(b[2]))
-		return __ffs(b[2]) + 64;
-	if (unlikely(b[3]))
-		return __ffs(b[3]) + 96;
-	if (b[4])
-		return __ffs(b[4]) + 128;
-	return __ffs(b[5]) + 32 + 128;
-}
-
-
 #endif /* __VAX_TMP_MMUCONTEXT_H  */

[LV-k25-commit] CVS: kernel-2.5/include/asm-vax thread_info.h,NONE,1.1

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax
In directory sc8-pr-cvs1:/tmp/cvs-serv13247

Added Files:
	thread_info.h 
Log Message:
This should have been added before importing 2.5.5.  Argh!


--- NEW FILE ---
/* thread_info.h: VAX low-level thread information
 *
 * Based on asm-i386/thread-info.h:
 * Copyright (C) 2002  David Howells (dho...@re...)
 * - Incorporating suggestions made by Linus Torvalds and Dave Miller
 *
 */

#ifndef _ASM_THREAD_INFO_H
#define _ASM_THREAD_INFO_H

#ifdef __KERNEL__

#ifndef __ASSEMBLY__
#include <asm/processor.h>
#include <asm/mtpr.h>
#endif

/*
 * low level task data that entry.S needs immediate access to
 * - this struct should fit entirely inside of one cache line
 * - this struct shares the supervisor stack pages
 * - if the contents of this structure are changed, the assembly constants must also be changed
 */
#ifndef __ASSEMBLY__
struct thread_info {
	struct task_struct	*task;		/* main task structure */
	struct exec_domain	*exec_domain;	/* execution domain */
	unsigned int		flags;		/* low level flags */
	unsigned int		cpu;		/* current CPU */
	int			preempt_count; /* 0 => preemptable, <0 => BUG */

	mm_segment_t		addr_limit;	/* thread address space:
					 	   0-0x7FFFFFFF for user-thead
						   0-0xFFFFFFFF for kernel-thread
						*/
	unsigned char		supervisor_stack[0];
};

#else /* !__ASSEMBLY__ */

/* offsets into the thread_info struct for assembly code access */
#define TI_TASK		0x00000000
#define TI_EXEC_DOMAIN	0x00000004
#define TI_FLAGS	0x00000008
#define TI_CPU		0x0000000C
#define TI_PRE_COUNT	0x00000010
#define TI_ADDR_LIMIT	0x00000014

#endif

/*
 * macros/functions for gaining access to the thread information structure
 */
#ifndef __ASSEMBLY__
#define INIT_THREAD_INFO(tsk)			\
{						\
	task:		&tsk,			\
	exec_domain:	&default_exec_domain,	\
	flags:		0,			\
	cpu:		0,			\
	addr_limit:	KERNEL_DS,		\
}

#define init_thread_info	(init_thread_union.thread_info)
#define init_stack		(init_thread_union.stack)

/* how to get the thread information struct from C */
static inline struct thread_info *current_thread_info(void)
{
	return (struct thread_info *)(__mfpr(PR_KSP) & ~8191);
}

/* thread information allocation */
#define THREAD_SIZE (2*PAGE_SIZE)
#define alloc_thread_info() ((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__ */

/* how to get the thread information struct from ASM */
#define GET_THREAD_INFO(reg) \
	mfpr $PR_KSP, reg  ; \
	bicl2 $8191, reg
#endif

/*
 * thread information flags
 * - these are process state flags that various assembly files may need to access
 * - pending work-to-be-done flags are in LSW
 * - other flags in MSW
 */
#define TIF_SYSCALL_TRACE	0	/* syscall trace active */
#define TIF_NOTIFY_RESUME	1	/* resumption notification requested */
#define TIF_SIGPENDING		2	/* signal pending */
#define TIF_NEED_RESCHED	3	/* rescheduling necessary */
#define TIF_POLLING_NRFLAG	17	/* true if poll_idle() is polling TIF_NEED_RESCHED */

#define _TIF_SYSCALL_TRACE	(1<<TIF_SYSCALL_TRACE)
#define _TIF_NOTIFY_RESUME	(1<<TIF_NOTIFY_RESUME)
#define _TIF_SIGPENDING		(1<<TIF_SIGPENDING)
#define _TIF_NEED_RESCHED	(1<<TIF_NEED_RESCHED)
#define _TIF_USEDFPU		(1<<TIF_USEDFPU)
#define _TIF_POLLING_NRFLAG	(1<<TIF_POLLING_NRFLAG)

#define _TIF_WORK_MASK		0x0000FFFE	/* work to do on interrupt/exception return */
#define _TIF_ALLWORK_MASK	0x0000FFFF	/* work to do on any return to u-space */

#endif /* __KERNEL__ */

#endif /* _ASM_THREAD_INFO_H */

[LV-k25-commit] CVS: kernel-2.5 Makefile,1.7,1.8 Rules.make,1.2,1.3

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5
In directory usw-pr-cvs1:/tmp/cvs-serv2713

Modified Files:
	Makefile Rules.make 
Log Message:
Merge Linus' 2.5.4 release.  Major change is the splitting of task_struct
into task_struct and struct thread_info.


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile	29 Sep 2002 19:29:49 -0000	1.7
+++ Makefile	29 Oct 2002 00:52:49 -0000	1.8
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 5
-SUBLEVEL = 3
+SUBLEVEL = 4
 EXTRAVERSION =
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
@@ -142,7 +142,6 @@
 DRIVERS-$(CONFIG_AGP) += drivers/char/agp/agp.o
 DRIVERS-$(CONFIG_DRM) += drivers/char/drm/drm.o
 DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/nubus.a
-DRIVERS-$(CONFIG_ISDN) += drivers/isdn/isdn.a
 DRIVERS-$(CONFIG_NET_FC) += drivers/net/fc/fc.o
 DRIVERS-$(CONFIG_APPLETALK) += drivers/net/appletalk/appletalk.o
 DRIVERS-$(CONFIG_TR) += drivers/net/tokenring/tr.o
@@ -180,6 +179,8 @@
 DRIVERS-$(CONFIG_TC) += drivers/tc/tc.a
 DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o
 DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o
+DRIVERS-$(CONFIG_GAMEPORT) += drivers/input/gameport/gamedrv.o
+DRIVERS-$(CONFIG_SERIO) += drivers/input/serio/seriodrv.o
 DRIVERS-$(CONFIG_I2O) += drivers/message/i2o/i2o.o
 DRIVERS-$(CONFIG_IRDA) += drivers/net/irda/irda.o
 DRIVERS-$(CONFIG_I2C) += drivers/i2c/i2c.o
@@ -187,11 +188,14 @@
 DRIVERS-$(CONFIG_MD) += drivers/md/mddev.o
 DRIVERS-$(CONFIG_BLUEZ) += drivers/bluetooth/bluetooth.o
 DRIVERS-$(CONFIG_HOTPLUG_PCI) += drivers/hotplug/vmlinux-obj.o
-DRIVERS-$(CONFIG_VSBUS) += drivers/vsbus/vsbus.a
+DRIVERS-$(CONFIG_ISDN) += drivers/isdn/vmlinux-obj.o
 
+# VAX-specific modules
+DRIVERS-$(CONFIG_VSBUS) += drivers/vsbus/vsbus.a
 DRIVERS-$(CONFIG_VAX) += drivers/vax/bus/vaxbus.o
 DRIVERS-$(CONFIG_VAX) += drivers/vax/char/vaxchar.o
 DRIVERS-$(CONFIG_VAX) += drivers/vax/net/vaxnet.o
+# End VAX-specific modules
 
 DRIVERS := $(DRIVERS-y)
 
@@ -212,7 +216,7 @@
 	drivers/scsi/aic7xxx/aicasm/aicasm_scan.c \
 	drivers/scsi/aic7xxx/aicasm/y.tab.h \
 	drivers/scsi/aic7xxx/aicasm/aicasm \
-	drivers/scsi/53c700-mem.c \
+	drivers/scsi/53c700_d.h \
 	net/khttpd/make_times_h \
 	net/khttpd/times.h \
 	submenu*
@@ -337,15 +341,17 @@
 	@echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))' >>.ver
 	@mv -f .ver $@
 
+comma	:= ,
+
 init/version.o: init/version.c include/linux/compile.h include/config/MARKER
-	$(CC) $(CFLAGS) $(CFLAGS_KERNEL) -DUTS_MACHINE='"$(ARCH)"' -c -o init/version.o init/version.c
+	$(CC) $(CFLAGS) $(CFLAGS_KERNEL) -DUTS_MACHINE='"$(ARCH)"' -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o init/version.o init/version.c
 
 # FIXME: GCC bug?  using -g here (in order to get source in the assembly listing)
 # reduces the BogoMIPS rating.  Examination of listing file shows that the compiler
 # optimizes less when we use -g (even though -O1 is in CFLAGS).  This isn't supposed
 # to happen...
 init/main.o: init/main.c include/config/MARKER
-	$(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -c -o $*.o $< -Wa,-adnhls=$*.lst
+	$(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o $*.o $< -Wa,-adnhls=$*.lst
 
 init/do_mounts.o: init/do_mounts.c include/config/MARKER
 	$(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -c -o $*.o $< -Wa,-adnhls=$*.lst

Index: Rules.make
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Rules.make,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Rules.make	20 May 2002 00:33:29 -0000	1.2
+++ Rules.make	29 Oct 2002 00:52:49 -0000	1.3
@@ -31,6 +31,8 @@
 unexport subdir-n
 unexport subdir-
 
+comma	:= ,
+
 #
 # Get things started.
 #
@@ -54,7 +56,7 @@
 	$(CPP) $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@) $< > $@
 
 %.o: %.c
-	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@) -c -o $@ $< -Wa,-adnhls=$*.lst -g
+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) $(CFLAGS_$@) -c -o $@ $< -Wa,-adnhls=$*.lst -g
 	@ ( \
 	    echo 'ifeq ($(strip $(subst $(comma),:,$(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@))),$$(strip $$(subst $$(comma),:,$$(CFLAGS) $$(EXTRA_CFLAGS) $$(CFLAGS_$@))))' ; \
 	    echo 'FILES_FLAGS_UP_TO_DATE += $@' ; \
@@ -271,7 +273,7 @@
 
 ifneq "$(strip $(export-objs))" ""
 $(export-objs): $(export-objs:.o=.c) $(TOPDIR)/include/linux/modversions.h
-	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@) -DEXPORT_SYMTAB -c $(@:.o=.c)
+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) $(CFLAGS_$@) -DEXPORT_SYMTAB -c $(@:.o=.c)
 	@ ( \
 	    echo 'ifeq ($(strip $(subst $(comma),:,$(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@) -DEXPORT_SYMTAB)),$$(strip $$(subst $$(comma),:,$$(CFLAGS) $$(EXTRA_CFLAGS) $$(CFLAGS_$@) -DEXPORT_SYMTAB)))' ; \
 	    echo 'FILES_FLAGS_UP_TO_DATE += $@' ; \

[LV-k25-commit] CVS: kernel-2.5/drivers/char/joystick Config.help,1.1.1.1,NONE Config.in,1.1.1.1,NONE Makefile,1.1.1.1,NONE a3d.c,1.1.1.1,NONE adi.c,1.1.1.1,NONE amijoy.c,1.1.1.1,NONE analog.c,1.1.1.1,NONE cobra.c,1.1.1.1,NONE cs461x.c,1.1.1.1,NONE db9.c,1.1.1.1,NONE emu10k1-gp.c,1.1.1.1,NONE gamecon.c,1.1.1.1,NONE gameport.c,1.1.1.1,NONE gf2k.c,1.1.1.1,NONE grip.c,1.1.1.1,NONE iforce.c,1.1.1.3,NONE interact.c,1.1.1.1,NONE lightning.c,1.1.1.1,NONE magellan.c,1.1.1.1,NONE ns558.c,1.1.1.2,NONE pcigame.c,1.1.1.1,NONE serio.c,1.1.1.1,NONE serport.c,1.1.1.2,NONE sidewinder.c,1.1.1.1,NONE spaceball.c,1.1.1.1,NONE spaceorb.c,1.1.1.1,NONE stinger.c,1.1.1.1,NONE tmdc.c,1.1.1.1,NONE turbografx.c,1.1.1.1,NONE warrior.c,1.1.1.1,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/char/joystick
In directory usw-pr-cvs1:/tmp/cvs-serv2713/drivers/char/joystick

Removed Files:
	Config.help Config.in Makefile a3d.c adi.c amijoy.c analog.c 
	cobra.c cs461x.c db9.c emu10k1-gp.c gamecon.c gameport.c 
	gf2k.c grip.c iforce.c interact.c lightning.c magellan.c 
	ns558.c pcigame.c serio.c serport.c sidewinder.c spaceball.c 
	spaceorb.c stinger.c tmdc.c turbografx.c warrior.c 
Log Message:
Merge Linus' 2.5.4 release.  Major change is the splitting of task_struct
into task_struct and struct thread_info.


--- Config.help DELETED ---

--- Config.in DELETED ---

--- Makefile DELETED ---

--- a3d.c DELETED ---

--- adi.c DELETED ---

--- amijoy.c DELETED ---

--- analog.c DELETED ---

--- cobra.c DELETED ---

--- cs461x.c DELETED ---

--- db9.c DELETED ---

--- emu10k1-gp.c DELETED ---

--- gamecon.c DELETED ---

--- gameport.c DELETED ---

--- gf2k.c DELETED ---

--- grip.c DELETED ---

--- iforce.c DELETED ---

--- interact.c DELETED ---

--- lightning.c DELETED ---

--- magellan.c DELETED ---

--- ns558.c DELETED ---

--- pcigame.c DELETED ---

--- serio.c DELETED ---

--- serport.c DELETED ---

--- sidewinder.c DELETED ---

--- spaceball.c DELETED ---

--- spaceorb.c DELETED ---

--- stinger.c DELETED ---

--- tmdc.c DELETED ---

--- turbografx.c DELETED ---

--- warrior.c DELETED ---

[LV-k25-commit] CVS: kernel-2.5/arch/mips .gdbinit,1.1.1.1,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/mips
In directory usw-pr-cvs1:/tmp/cvs-serv2713/arch/mips

Removed Files:
	.gdbinit 
Log Message:
Merge Linus' 2.5.4 release.  Major change is the splitting of task_struct
into task_struct and struct thread_info.


--- .gdbinit DELETED ---

[LV-k25-commit] CVS: kernel-2.5/init main.c,1.5,1.6

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/init
In directory usw-pr-cvs1:/tmp/cvs-serv2713/init

Modified Files:
	main.c 
Log Message:
Merge Linus' 2.5.4 release.  Major change is the splitting of task_struct
into task_struct and struct thread_info.


Index: main.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/init/main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- main.c	6 Jun 2002 00:12:24 -0000	1.5
+++ main.c	29 Oct 2002 00:52:51 -0000	1.6
@@ -31,8 +31,6 @@
 #include <asm/io.h>
 #include <asm/bugs.h>
 
-#include <linux/device.h>
-
 #if defined(CONFIG_ARCH_S390)
 #include <asm/s390mach.h>
 #include <asm/ccwcache.h>
@@ -451,10 +449,6 @@
 #if defined(CONFIG_ARCH_S390)
 	s390_init_machine_check();
 #endif
-
-	/* bring up the device tree */
-	device_driver_init();
-
 	/* Networking initialization needs a process context */ 
 	sock_init();
 

[LV-k25-commit] CVS: kernel-2.5/include/asm-vax current.h,1.3,1.4 irq.h,1.3,1.4 processor.h,1.4,1.5 siginfo.h,1.3,1.4 uaccess.h,1.3,1.4

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax
In directory usw-pr-cvs1:/tmp/cvs-serv2713/include/asm-vax

Modified Files:
	current.h irq.h processor.h siginfo.h uaccess.h 
Log Message:
Merge Linus' 2.5.4 release.  Major change is the splitting of task_struct
into task_struct and struct thread_info.


Index: current.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/current.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- current.h	20 May 2002 00:33:39 -0000	1.3
+++ current.h	29 Oct 2002 00:52:51 -0000	1.4
@@ -1,8 +1,7 @@
 #ifndef _VAX_CURRENT_H
 #define _VAX_CURRENT_H
 
-#include <asm/psl.h>
-#include <asm/mtpr.h>
+#include <asm/thread_info.h>
 
 struct task_struct;
 
@@ -19,7 +18,7 @@
 
 static inline struct task_struct * get_current(void)
 {
-   return (struct task_struct *)(__mfpr(PR_KSP) & ~8191);
+	return current_thread_info()->task;
 }
 
 #define current get_current()

Index: irq.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/irq.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- irq.h	20 May 2002 00:33:39 -0000	1.3
+++ irq.h	29 Oct 2002 00:52:51 -0000	1.4
@@ -23,6 +23,9 @@
 
 #ifndef __ASSEMBLY__
 
+#include <linux/threads.h>  /* for NR_CPUS */
+#include <asm/psl.h>        /* for struct psl_fields */
+#include <asm/ptrace.h>     /* for struct pt_regs */
 
 extern void disable_irq(unsigned int);
 extern void enable_irq(unsigned int);

Index: processor.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/processor.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- processor.h	31 May 2002 01:58:39 -0000	1.4
+++ processor.h	29 Oct 2002 00:52:51 -0000	1.5
@@ -14,6 +14,7 @@
 #include <asm/page.h>
 #include <asm/vaxcpu.h> /* CPU type definitions */
 #include <asm/mm/task.h> /* task memory space defines */
+
 /*
  * Default implementation of macro that returns current
  * instruction pointer ("program counter").
@@ -53,21 +54,16 @@
 /* At present only the pcb is here. */
 #define INIT_THREAD { INIT_PCB } 
 
-#include <asm/ptrace.h>
-
-/* go with the flow here. Everyone else defines 
- * THREAD_SIZE to be 8192 or similar. FIXME: */
+// #include <asm/ptrace.h>
 
-#define THREAD_SIZE (8192)
+struct task_struct;
+struct pt_regs;
 
 /*
  * Do necessary setup to start up a newly executed thread.
  */
 extern void start_thread(struct pt_regs *, unsigned long, unsigned long);
 
-/* Forward declaration, a strange C thing */
-struct task_struct;
-
 /* Free all resources held by a thread. */
 static inline void release_thread(struct task_struct *p)
 {
@@ -90,12 +86,12 @@
 
 /*
  * Return saved PC of a blocked thread.
+ * This needs to be a #define rather than an inline, since we 
+ * don't have the full definition of task_struct at this point
+ * in the compilation (linux/sched.h includes this file before
+ * defining task_struct)
  */
-extern inline unsigned long thread_saved_pc(struct thread_struct *t)
-{
-           return ((unsigned long *)t->pcb.pc)[3];
-}
- 
+#define thread_saved_pc(tsk)   tsk->thread.pcb.pc
 
 unsigned long get_wchan(struct task_struct *p);
 
@@ -108,24 +104,6 @@
 
 #define KSTK_EIP(tsk)	(0xdeadbeef)
 #define KSTK_ESP(tsk)	(0xdeadbeef)
-
-
-
-
-/* NOTE: The task struct and the stack go together!
-   Later, we may do this with a small look-aside cache
-   so that we'll be able to allocate contiguous 16-page
-   chunks later when memory gets fragmented on small
-   machines.  See arch/i386/kernel/process.c for the
-   implementation of this.  */
-
-#define alloc_task_struct() \
-        ((struct task_struct *) __get_free_pages(GFP_KERNEL,1))
-#define free_task_struct(p)     free_pages((unsigned long)(p),1)
-#define get_task_struct(tsk)      atomic_inc(&virt_to_page(tsk)->count)
-
-#define init_task	(init_task_union.task)
-#define init_stack	(init_task_union.stack)
 
 #define cpu_relax()      do { } while (0)  
 

Index: siginfo.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/siginfo.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- siginfo.h	20 May 2002 00:33:39 -0000	1.3
+++ siginfo.h	29 Oct 2002 00:52:51 -0000	1.4
@@ -109,6 +109,7 @@
 #define SI_MESGQ	-3		/* sent by real time mesq state change */
 #define SI_ASYNCIO	-4		/* sent by AIO completion */
 #define SI_SIGIO	-5		/* sent by queued SIGIO */
+#define SI_TKILL	-6		/* sent by tkill system call */
 
 #define SI_FROMUSER(siptr)	((siptr)->si_code <= 0)
 #define SI_FROMKERNEL(siptr)	((siptr)->si_code > 0)

Index: uaccess.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/uaccess.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- uaccess.h	20 May 2002 00:33:39 -0000	1.3
+++ uaccess.h	29 Oct 2002 00:52:51 -0000	1.4
@@ -25,8 +25,8 @@
 #define USER_DS		MAKE_MM_SEG(PAGE_OFFSET)
 
 #define get_ds()	(KERNEL_DS)
-#define get_fs()	(current->addr_limit)
-#define set_fs(x)	(current->addr_limit = (x))
+#define get_fs()	(current_thread_info()->addr_limit)
+#define set_fs(x)	(current_thread_info()->addr_limit = (x))
 
 #define segment_eq(a,b)	((a).seg == (b).seg)
 

[LV-k25-commit] CVS: kernel-2.5/drivers Makefile,1.4,1.5

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers
In directory usw-pr-cvs1:/tmp/cvs-serv2713/drivers

Modified Files:
	Makefile 
Log Message:
Merge Linus' 2.5.4 release.  Major change is the splitting of task_struct
into task_struct and struct thread_info.


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	18 Jul 2002 23:36:16 -0000	1.4
+++ Makefile	29 Oct 2002 00:52:50 -0000	1.5
@@ -8,7 +8,7 @@
 
 mod-subdirs :=	dio mtd sbus video macintosh usb input telephony sgi ide \
 		message/i2o message/fusion scsi md ieee1394 pnp isdn atm \
-		fc4 net/hamradio i2c acpi bluetooth
+		fc4 net/hamradio i2c acpi bluetooth input/serio input/gameport
 
 subdir-y :=	base parport char block net sound misc media cdrom hotplug
 subdir-m :=	$(subdir-y)
@@ -27,6 +27,8 @@
 subdir-$(CONFIG_ALL_PPC)	+= macintosh
 subdir-$(CONFIG_USB)		+= usb
 subdir-$(CONFIG_INPUT)		+= input
+subdir-$(CONFIG_SERIO)		+= input/serio
+subdir-$(CONFIG_GAMEPORT)	+= input/gameport
 subdir-$(CONFIG_PHONE)		+= telephony
 subdir-$(CONFIG_SGI)		+= sgi
 subdir-$(CONFIG_IDE)		+= ide

[LV-k25-commit] CVS: kernel-2.5/drivers/net Makefile,1.4,1.5

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/net
In directory usw-pr-cvs1:/tmp/cvs-serv2713/drivers/net

Modified Files:
	Makefile 
Log Message:
Merge Linus' 2.5.4 release.  Major change is the splitting of task_struct
into task_struct and struct thread_info.


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	6 Jun 2002 00:12:24 -0000	1.4
+++ Makefile	29 Oct 2002 00:52:50 -0000	1.5
@@ -68,7 +68,7 @@
 obj-$(CONFIG_PCNET32) += pcnet32.o
 obj-$(CONFIG_EEPRO100) += eepro100.o
 obj-$(CONFIG_TLAN) += tlan.o
-obj-$(CONFIG_EPIC100) += epic100.o
+obj-$(CONFIG_EPIC100) += epic100.o mii.o
 obj-$(CONFIG_SIS900) += sis900.o
 obj-$(CONFIG_DM9102) += dmfe.o
 obj-$(CONFIG_YELLOWFIN) += yellowfin.o
@@ -77,7 +77,7 @@
 obj-$(CONFIG_NATSEMI) += natsemi.o
 obj-$(CONFIG_NS83820) += ns83820.o
 obj-$(CONFIG_STNIC) += stnic.o 8390.o
-obj-$(CONFIG_FEALNX) += fealnx.o
+obj-$(CONFIG_FEALNX) += fealnx.o mii.o
 
 ifeq ($(CONFIG_SK98LIN),y)
 obj-y += sk98lin/sk98lin.o
@@ -87,7 +87,7 @@
   obj-y += skfp/skfp.o
 endif
 
-obj-$(CONFIG_VIA_RHINE) += via-rhine.o
+obj-$(CONFIG_VIA_RHINE) += via-rhine.o mii.o
 obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
 
 #
@@ -100,7 +100,7 @@
 obj-$(CONFIG_AIRONET4500_PROC)	+= aironet4500_proc.o
 obj-$(CONFIG_AIRONET4500_CS)	+= aironet4500_proc.o
 
-obj-$(CONFIG_WINBOND_840) += winbond-840.o
+obj-$(CONFIG_WINBOND_840) += winbond-840.o mii.o
 obj-$(CONFIG_SUNDANCE) += sundance.o
 obj-$(CONFIG_HAMACHI) += hamachi.o
 obj-$(CONFIG_NET) += Space.o setup.o net_init.o loopback.o
@@ -164,8 +164,8 @@
 obj-$(CONFIG_3C515) += 3c515.o
 obj-$(CONFIG_EEXPRESS) += eexpress.o
 obj-$(CONFIG_EEXPRESS_PRO) += eepro.o
-obj-$(CONFIG_8139CP) += 8139cp.o
-obj-$(CONFIG_8139TOO) += 8139too.o
+obj-$(CONFIG_8139CP) += 8139cp.o mii.o
+obj-$(CONFIG_8139TOO) += 8139too.o mii.o
 obj-$(CONFIG_ARLAN) += arlan.o arlan-proc.o
 obj-$(CONFIG_ZNET) += znet.o
 obj-$(CONFIG_LAN_SAA9730) += saa9730.o

[LV-k25-commit] CVS: kernel-2.5/drivers/sound .indent.pro,1.1.1.1,NONE .version,1.1.1.1,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/sound
In directory usw-pr-cvs1:/tmp/cvs-serv2713/drivers/sound

Removed Files:
	.indent.pro .version 
Log Message:
Merge Linus' 2.5.4 release.  Major change is the splitting of task_struct
into task_struct and struct thread_info.


--- .indent.pro DELETED ---

--- .version DELETED ---

[LV-k25-commit] CVS: kernel-2.5/linux zconf.h,1.1.1.1,NONE zutil.h,1.1.1.1,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/linux
In directory usw-pr-cvs1:/tmp/cvs-serv2713/linux

Removed Files:
	zconf.h zutil.h 
Log Message:
Merge Linus' 2.5.4 release.  Major change is the splitting of task_struct
into task_struct and struct thread_info.


--- zconf.h DELETED ---

--- zutil.h DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/char Makefile,1.2,1.3

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv2713/drivers/char

Modified Files:
	Makefile 
Log Message:
Merge Linus' 2.5.4 release.  Major change is the splitting of task_struct
into task_struct and struct thread_info.


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	29 Sep 2002 19:33:16 -0000	1.2
+++ Makefile	29 Oct 2002 00:52:50 -0000	1.3
@@ -25,7 +25,7 @@
 			misc.o pty.o random.o selection.o serial.o \
 			sonypi.o tty_io.o tty_ioctl.o generic_serial.o
 
-mod-subdirs	:=	joystick ftape drm pcmcia
+mod-subdirs	:=	ftape drm pcmcia
 
 list-multi	:=	
 
@@ -167,15 +167,10 @@
 obj-$(CONFIG_SERIAL_IPR) += generic_serial.o
 
 subdir-$(CONFIG_RIO) += rio
-subdir-$(CONFIG_INPUT) += joystick
 
 obj-$(CONFIG_ATIXL_BUSMOUSE) += atixlmouse.o
 obj-$(CONFIG_LOGIBUSMOUSE) += logibusmouse.o
 obj-$(CONFIG_PRINTER) += lp.o
-
-ifeq ($(CONFIG_INPUT),y)
-obj-y += joystick/js.o
-endif
 
 obj-$(CONFIG_BUSMOUSE) += busmouse.o
 obj-$(CONFIG_DTLK) += dtlk.o

[LV-k25-commit] CVS: kernel-2.5/arch/vax/boot head.S,1.4,1.5

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/boot
In directory usw-pr-cvs1:/tmp/cvs-serv2713/arch/vax/boot

Modified Files:
	head.S 
Log Message:
Merge Linus' 2.5.4 release.  Major change is the splitting of task_struct
into task_struct and struct thread_info.


Index: head.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/boot/head.S,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- head.S	28 May 2002 20:29:28 -0000	1.4
+++ head.S	29 Oct 2002 00:52:50 -0000	1.5
@@ -315,7 +315,7 @@
 # my loading KSP with the top of the kernel stack for the 'init task'
 # and faking a saved PC/PSL on the interrupt stack which we then
 # 'return' to
-    moval init_task_union, r0
+    moval init_thread_union, r0
     addl2 $8192, r0            # taken from <linux/sched.h>
     mtpr r0,$PR_KSP
 

[LV-k25-commit] CVS: kernel-2.5/fs/inflate_fs zconf.h,1.1.1.1,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/fs/inflate_fs
In directory usw-pr-cvs1:/tmp/cvs-serv2713/fs/inflate_fs

Removed Files:
	zconf.h 
Log Message:
Merge Linus' 2.5.4 release.  Major change is the splitting of task_struct
into task_struct and struct thread_info.


--- zconf.h DELETED ---

[LV-k25-commit] CVS: kernel-2.5/kernel panic.c,1.2,1.3

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv2713/kernel

Modified Files:
	panic.c 
Log Message:
Merge Linus' 2.5.4 release.  Major change is the splitting of task_struct
into task_struct and struct thread_info.


Index: panic.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/kernel/panic.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- panic.c	20 May 2002 00:33:39 -0000	1.2
+++ panic.c	29 Oct 2002 00:52:51 -0000	1.3
@@ -106,6 +106,10 @@
 /**
  *	print_tainted - return a string to represent the kernel taint state.
  *
+ *  'P' - Proprietory module has been loaded.
+ *  'F' - Module has been forcibly loaded.
+ *  'S' - SMP with CPUs not designed for SMP.
+ *
  *	The string is overwritten by the next call to print_taint().
  */
  
@@ -113,9 +117,10 @@
 {
 	static char buf[20];
 	if (tainted) {
-		snprintf(buf, sizeof(buf), "Tainted: %c%c",
-			tainted & 1 ? 'P' : 'G',
-			tainted & 2 ? 'F' : ' ');
+		snprintf(buf, sizeof(buf), "Tainted: %c%c%c",
+			tainted & TAINT_PROPRIETORY_MODULE ? 'P' : 'G',
+			tainted & TAINT_FORCED_MODULE ? 'F' : ' ',
+			tainted & TAINT_UNSAFE_SMP ? 'S' : ' ');
 	}
 	else
 		snprintf(buf, sizeof(buf), "Not tainted");

[LV-k25-commit] CVS: kernel-2.5/arch/vax/kernel cpu_ka43.c,1.7,1.8 entry.S,1.4,1.5 init_task.c,1.5,1.6 interrupt.c,1.6,1.7 process.c,1.6,1.7 ptrace.c,1.5,1.6

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv2713/arch/vax/kernel

Modified Files:
	cpu_ka43.c entry.S init_task.c interrupt.c process.c ptrace.c 
Log Message:
Merge Linus' 2.5.4 release.  Major change is the splitting of task_struct
into task_struct and struct thread_info.


Index: cpu_ka43.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka43.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cpu_ka43.c	5 Jun 2002 21:55:03 -0000	1.7
+++ cpu_ka43.c	29 Oct 2002 00:52:50 -0000	1.8
@@ -167,8 +167,10 @@
    * Resetting the cache involves disabling it, then clear it and enable again.
    */
    ka43_cache_disable(ka43_creg_addr);
+#if 0
    ka43_cache_clear(ka43_ctag_addr);
    ka43_cache_enable(ka43_creg_addr);
+#endif
 }
 
 void ka43_init_devices(void)
@@ -207,8 +209,13 @@
    
    /* Unknown error state, panic/halt the machine */
    printk("KA43: Machine Check - unknown error state - halting\n");
-   machine_halt();
 
+   printk("\nStack dump\n"); 
+   hex_dump((void *)(&stkframe), 256);
+   dump_cur_regs(1);
+   show_cpu_regs();
+
+   machine_halt();
 }
 
 /* slap the KA43_DIAGMEM bit on an area of S0 memory - used by drivers */

Index: entry.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/entry.S,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- entry.S	20 May 2002 00:33:33 -0000	1.4
+++ entry.S	29 Oct 2002 00:52:50 -0000	1.5
@@ -474,6 +474,7 @@
 	.long sys_madvise
 	.long sys_getdents64       /* 220 */
 	.long sys_fcntl64  
+	.long sys_tkill
 	/*
 	
          * NOTE!! This doesn't have to be exact - we just have

Index: init_task.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/init_task.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- init_task.c	6 Jun 2002 00:12:24 -0000	1.5
+++ init_task.c	29 Oct 2002 00:52:50 -0000	1.6
@@ -17,7 +17,7 @@
 struct mm_struct init_mm = INIT_MM(init_mm);
 
 /*
- * Initial task structure.
+ * Initial thread structure.
  *
  * We need to make sure that this is 8192-byte aligned due to the
  * way process stacks are handled. This is done by having a special
@@ -26,7 +26,14 @@
  * Note that once we drop from IPL 31 to IPL 0 during init, we'll
  * be using the stack inside this union as the kernel stack.
  */
-union task_union init_task_union 
+union thread_union init_thread_union 
 	 __attribute__((__section__(".data.init_task")))  = 
-            { INIT_TASK(init_task_union.task) };
+            { INIT_THREAD_INFO(init_task) };
  
+/* 
+ * Initial task structure.
+ *
+ * All other task structs will be allocated on slabs in fork.c
+ */
+struct task_struct init_task = INIT_TASK(init_task);
+

Index: interrupt.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/interrupt.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- interrupt.c	6 Jun 2002 00:12:24 -0000	1.6
+++ interrupt.c	29 Oct 2002 00:52:50 -0000	1.7
@@ -542,7 +542,7 @@
 	}
    
 	/* check for pending signals */
-	if (current->work.sigpending != 0) {
+	if (test_tsk_thread_flag(current, TIF_SIGPENDING)) {
 	   /* FIXME: do we need to check the IPL here (i386 does a sti here) */
 	   /* FIXME: oldset? */
 	   do_signal(0,regs);

Index: process.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/process.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- process.c	6 Jun 2002 00:12:24 -0000	1.6
+++ process.c	29 Oct 2002 00:52:50 -0000	1.7
@@ -111,12 +111,7 @@
    struct pt_regs *child_regs;
    void *stack_top;
 		      
-   /* stack top is at the end of the task_union
-      - take the pointer, add in the size of task_union, 
-        and then drop by a longword to keep it within the 
-        current union 
-    */
-   stack_top = ((union task_union *)p)+1; 
+   stack_top = (unsigned char *)(p->thread_info) + THREAD_SIZE;
    stack_top -= 4;
    
    child_stack = (struct new_thread_stack *)(stack_top) - 1;

Index: ptrace.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/ptrace.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ptrace.c	6 Jun 2002 00:12:24 -0000	1.5
+++ ptrace.c	29 Oct 2002 00:52:50 -0000	1.6
@@ -39,7 +39,7 @@
 	unsigned long *pc1, *pc2;
 	void *stack_top;
 
-	stack_top = ((union task_union *)child)+1; 
+	stack_top = child->thread_info + THREAD_SIZE; 
 	stack_top -= 4;
 
 	
@@ -272,15 +272,9 @@
 		if ((unsigned long) data > _NSIG)
 			break;
 		if (request == PTRACE_SYSCALL) {
-			if (!(child->ptrace & PT_SYSCALLTRACE)) {
-				child->ptrace |= PT_SYSCALLTRACE;
-				child->work.syscall_trace++;
-			}	
+			set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
 		} else {
-			if (child->ptrace & PT_SYSCALLTRACE) {
-				child->ptrace &= ~PT_SYSCALLTRACE;
-				child->work.syscall_trace--;
-			}
+			clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
 		}
 		child->exit_code = data;
 		wake_up_process(child);
@@ -308,10 +302,7 @@
                 res = -EIO;
                 if ((unsigned long) data > _NSIG)
 		        break;
-		if (child->ptrace & PT_SYSCALLTRACE) {
-			child->ptrace &= ~PT_SYSCALLTRACE;
-			child->work.syscall_trace--;
-		}
+		clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
 		if ((child->ptrace & PT_DTRACE)==0)
 		  child->ptrace |= PT_DTRACE;
 		
@@ -336,7 +327,7 @@
 		goto out;
 	}
 out_tsk:
-	free_task_struct(child);
+	put_task_struct(child);
 out:
 	unlock_kernel();
 	return res;
@@ -344,8 +335,9 @@
 
 asmlinkage void syscall_trace(void)
 {
-	if ((current->ptrace & (PT_PTRACED|PT_SYSCALLTRACE))
-			!= (PT_PTRACED|PT_SYSCALLTRACE))
+	if (!test_thread_flag(TIF_SYSCALL_TRACE))
+		return;
+	if (!(current->ptrace & PT_PTRACED))
 		return;
 	current->exit_code = SIGTRAP;
 	current->state = TASK_STOPPED;

[LV-k25-commit] CVS: kernel-2.5/arch/sparc64/kernel check_asm.sh,1.1.1.2,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/sparc64/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv2713/arch/sparc64/kernel

Removed Files:
	check_asm.sh 
Log Message:
Merge Linus' 2.5.4 release.  Major change is the splitting of task_struct
into task_struct and struct thread_info.


--- check_asm.sh DELETED ---

[LV-k25-commit] CVS: kernel-2.5/include/linux proc_fs_i.h,1.1.1.1,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/include/linux
In directory usw-pr-cvs1:/tmp/cvs-serv2713/include/linux

Removed Files:
	proc_fs_i.h 
Log Message:
Merge Linus' 2.5.4 release.  Major change is the splitting of task_struct
into task_struct and struct thread_info.


--- proc_fs_i.h DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/usb ibmcam.h,1.1.1.2,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/usb
In directory usw-pr-cvs1:/tmp/cvs-serv2713/drivers/usb

Removed Files:
	ibmcam.h 
Log Message:
Merge Linus' 2.5.4 release.  Major change is the splitting of task_struct
into task_struct and struct thread_info.


--- ibmcam.h DELETED ---