From: Richard Henderson <rth@dot.sfbay.redhat.com>
Date: Sun, 3 Nov 2002 08:57:35 +0000 (-0800)
Subject: Misc Alpha compilation fixes.
X-Git-Tag: v2.5.46~7^2~1
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=8fdb40a299b8e419be4ea15c458787d0e73fd355;p=history.git

Misc Alpha compilation fixes.
---

diff --git a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c
index b3b12b2bafa5..e45feb583f1d 100644
--- a/arch/alpha/kernel/irq.c
+++ b/arch/alpha/kernel/irq.c
@@ -590,7 +590,7 @@ handle_irq(int irq, struct pt_regs * regs)
 	}
 
 	irq_enter();
-	kstat_cpu(i).irqs[irq]++;
+	kstat_cpu(cpu).irqs[irq]++;
 	spin_lock_irq(&desc->lock); /* mask also the higher prio events */
 	desc->handler->ack(irq);
 	/*
diff --git a/include/asm-alpha/mman.h b/include/asm-alpha/mman.h
index 51d1a3078b39..ded73a94a99d 100644
--- a/include/asm-alpha/mman.h
+++ b/include/asm-alpha/mman.h
@@ -19,11 +19,13 @@
 #define _MAP_UNALIGNED	0x0800
 
 /* These are linux-specific */
-#define MAP_GROWSDOWN	0x1000		/* stack-like segment */
-#define MAP_DENYWRITE	0x2000		/* ETXTBSY */
-#define MAP_EXECUTABLE	0x4000		/* mark it as an executable */
-#define MAP_LOCKED	0x8000		/* lock the mapping */
+#define MAP_GROWSDOWN	0x01000		/* stack-like segment */
+#define MAP_DENYWRITE	0x02000		/* ETXTBSY */
+#define MAP_EXECUTABLE	0x04000		/* mark it as an executable */
+#define MAP_LOCKED	0x08000		/* lock the mapping */
 #define MAP_NORESERVE	0x10000		/* don't check for reservations */
+#define MAP_POPULATE	0x20000		/* populate (prefault) pagetables */
+#define MAP_NONBLOCK	0x40000		/* do not block on IO */
 
 #define MS_ASYNC	1		/* sync memory asynchronously */
 #define MS_SYNC		2		/* synchronous memory sync */
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index a4ea79e81e45..0afc6a560a8d 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -7,6 +7,7 @@
 #include <linux/mount.h>
 #include <linux/list.h>
 #include <linux/spinlock.h>
+#include <linux/cache.h>
 #include <asm/page.h>			/* for BUG() */
 
 /*