Misc Alpha compilation fixes.

diff --git a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c
index b3b12b2bafa5da4debc7068fb716a53564fd564d..e45feb583f1d708e0e9f8334f3cae439c8375938 100644 (file)
--- 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 51d1a3078b3937771785b88f7d9b85cf5798791d..ded73a94a99d79c39de2b8d4ba72a935838301ef 100644 (file)
--- 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 a4ea79e81e450ef1cc69408709c64e29c6c7708a..0afc6a560a8dcea6f0c68a8996d16c814fe07307 100644 (file)
--- 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() */
 
 /*