Merge with Linux 2.3.49.

9 files changed, 28 insertions, 13 deletions

diff --git a/include/asm-mips64/checksum.h b/include/asm-mips64/checksum.h
index effc917c7..94206a81c 100644
--- a/include/asm-mips64/checksum.h
+++ b/include/asm-mips64/checksum.h
@@ -1,4 +1,4 @@
-/* $Id: checksum.h,v 1.5 2000/02/18 00:24:48 ralf Exp $
+/* $Id: checksum.h,v 1.6 2000/02/18 22:06:19 ralf Exp $
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
@@ -10,8 +10,6 @@
 #ifndef _ASM_CHECKSUM_H
 #define _ASM_CHECKSUM_H
 
-#include <asm/checksum.h>
-
 /*
  * computes the checksum of a memory block at buff, length len,
  * and adds in "sum" (32-bit)
diff --git a/include/asm-mips64/dma.h b/include/asm-mips64/dma.h
index b109ce0ff..ef380f1d4 100644
--- a/include/asm-mips64/dma.h
+++ b/include/asm-mips64/dma.h
@@ -1,4 +1,4 @@
-/* $Id: dma.h,v 1.3 1999/12/04 03:59:12 ralf Exp $
+/* $Id: dma.h,v 1.4 2000/01/29 01:42:28 ralf Exp $
  *
  * linux/include/asm/dma.h: Defines for using and allocating dma channels.
  * Written by Hennus Bergman, 1992.
@@ -13,7 +13,6 @@
 #ifndef _ASM_DMA_H
 #define _ASM_DMA_H
 
-#include <linux/config.h>
 #include <asm/io.h>			/* need byte IO */
 #include <linux/spinlock.h>		/* And spinlocks */
 #include <linux/delay.h>
diff --git a/include/asm-mips64/hardirq.h b/include/asm-mips64/hardirq.h
index 7200ad062..29d780328 100644
--- a/include/asm-mips64/hardirq.h
+++ b/include/asm-mips64/hardirq.h
@@ -1,4 +1,4 @@
-/* $Id: hardirq.h,v 1.4 2000/02/23 00:41:38 ralf Exp $
+/* $Id: hardirq.h,v 1.5 2000/03/02 02:37:13 ralf Exp $
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
@@ -13,6 +13,20 @@
 #include <linux/threads.h>
 #include <linux/irq.h>
 
+typedef struct {
+	unsigned long __local_irq_count;
+	unsigned long __local_bh_count;
+	unsigned long __pad[14];
+} ____cacheline_aligned irq_cpustat_t;
+
+extern irq_cpustat_t irq_stat [NR_CPUS];
+
+/*
+ * Simple wrappers reducing source bloat
+ */
+#define local_irq_count(cpu) (irq_stat[(cpu)].__local_irq_count)
+#define local_bh_count(cpu) (irq_stat[(cpu)].__local_bh_count)
+
 /*
  * Are we in an interrupt context? Either doing bottom half
  * or hardware interrupt processing?
diff --git a/include/asm-mips64/keyboard.h b/include/asm-mips64/keyboard.h
index 6748eb8c2..067d06e69 100644
--- a/include/asm-mips64/keyboard.h
+++ b/include/asm-mips64/keyboard.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: keyboard.h,v 1.1 1999/08/19 22:56:34 ralf Exp $
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
@@ -11,7 +11,6 @@
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <asm/bootinfo.h>
diff --git a/include/asm-mips64/mmu_context.h b/include/asm-mips64/mmu_context.h
index ca41d022b..878fe8300 100644
--- a/include/asm-mips64/mmu_context.h
+++ b/include/asm-mips64/mmu_context.h
@@ -1,4 +1,4 @@
-/* $Id: mmu_context.h,v 1.3 2000/02/04 07:40:53 ralf Exp $
+/* $Id: mmu_context.h,v 1.4 2000/02/23 00:41:38 ralf Exp $
  *
  * Switch a MMU context.
  *
@@ -12,7 +12,6 @@
 #ifndef _ASM_MMU_CONTEXT_H
 #define _ASM_MMU_CONTEXT_H
 
-#include <linux/config.h>
 #include <asm/pgalloc.h>
 
 /* Fuck.  The f-word is here so you can grep for it :-)  */
diff --git a/include/asm-mips64/mmzone.h b/include/asm-mips64/mmzone.h
index e49d0fc75..795aed323 100644
--- a/include/asm-mips64/mmzone.h
+++ b/include/asm-mips64/mmzone.h
@@ -4,6 +4,7 @@
 #ifndef _ASM_MMZONE_H_
 #define _ASM_MMZONE_H_
 
+#include <linux/config.h>
 #include <asm/sn/types.h>
 #include <asm/sn/addrs.h>
 #include <asm/sn/arch.h>
diff --git a/include/asm-mips64/pgtable.h b/include/asm-mips64/pgtable.h
index 0dc2145cf..87b06e444 100644
--- a/include/asm-mips64/pgtable.h
+++ b/include/asm-mips64/pgtable.h
@@ -1,4 +1,4 @@
-/* $Id: pgtable.h,v 1.13 2000/02/27 01:03:24 kanoj Exp $
+/* $Id: pgtable.h,v 1.14 2000/03/02 02:37:13 ralf Exp $
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
@@ -72,6 +72,7 @@ extern void (*_flush_page_to_ram)(struct page * page);
 #define PTRS_PER_PMD	1024
 #define PTRS_PER_PTE	512
 #define USER_PTRS_PER_PGD	(TASK_SIZE/PGDIR_SIZE)
+#define FIRST_USER_PGD_NR	0
 
 #define VMALLOC_START     XKSEG
 #define VMALLOC_VMADDR(x) ((unsigned long)(x))
diff --git a/include/asm-mips64/sn/sn0/hubmd.h b/include/asm-mips64/sn/sn0/hubmd.h
index 3ba29154e..f1133fab1 100644
--- a/include/asm-mips64/sn/sn0/hubmd.h
+++ b/include/asm-mips64/sn/sn0/hubmd.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: hubmd.h,v 1.1 2000/01/13 00:17:02 ralf Exp $
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
@@ -12,6 +12,8 @@
 #ifndef	_ASM_SN_SN0_HUBMD_H
 #define	_ASM_SN_SN0_HUBMD_H
 
+#include <linux/config.h>
+
 /*
  * Hub Memory/Directory interface registers
  */
diff --git a/include/asm-mips64/socket.h b/include/asm-mips64/socket.h
index 5c8a18041..02be40b6b 100644
--- a/include/asm-mips64/socket.h
+++ b/include/asm-mips64/socket.h
@@ -1,4 +1,4 @@
-/* $Id: socket.h,v 1.1 1999/08/18 23:37:52 ralf Exp $
+/* $Id: socket.h,v 1.2 2000/02/25 21:52:09 ralf Exp $
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
@@ -63,6 +63,8 @@ To add: #define SO_REUSEPORT 0x0200	/* Allow local address and port reuse.  */
 
 #ifdef __KERNEL__
 
+#define SO_PEERNAME             28
+
 /* Types of sockets.  */
 #define SOCK_DGRAM 1		/* Connectionless, unreliable datagrams
 				   of fixed maximum length.  */