[PATCH] alpha: compile fixes

 - add another argument to do_fork();
 - assorted compile fixes.

diff --git a/arch/alpha/Makefile b/arch/alpha/Makefile
index c22b4900075f324b509121b08e5447eda0fda8c4..5ff98abd62ad116f3513b597c77ac3f62e592ebf 100644 (file)
--- a/arch/alpha/Makefile
+++ b/arch/alpha/Makefile
@@ -128,6 +128,9 @@ archmrproper:
 
 vmlinux: arch/alpha/vmlinux.lds.s
 
+arch/$(ARCH)/vmlinux.lds.s: arch/$(ARCH)/vmlinux.lds.S
+       $(CPP) $(CPPFLAGS) $(CPPFLAGS_$@) -D__ASSEMBLY__ -P -C -U$(ARCH) $< -o $@
+
 bootpfile:
        @$(MAKEBOOT) bootpfile
 

diff --git a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c
index 71bff0b0248860454331c245515d964f83773d6c..ff03ca642089bc76c7a622c89186c84120a554c1 100644 (file)
--- a/arch/alpha/kernel/irq.c
+++ b/arch/alpha/kernel/irq.c
@@ -12,11 +12,11 @@
 
 #include <linux/config.h>
 #include <linux/kernel.h>
-#include <linux/ptrace.h>
 #include <linux/errno.h>
 #include <linux/kernel_stat.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
+#include <linux/ptrace.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <linux/random.h>

diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c
index ae466ff906965c85eb2cf0d3f02018a4b58d670e..b0cd16ef9493b82ff344e227003d5794121da21c 100644 (file)
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
@@ -261,11 +261,13 @@ alpha_clone(unsigned long clone_flags, unsigned long usp,
            struct switch_stack * swstack)
 {
        struct task_struct *p;
+       struct pt_regs *u_regs = (struct pt_regs *) (swstack+1);
+       int *user_tid = (int *)u_regs->r19;
+
        if (!usp)
                usp = rdusp();
 
-       p = do_fork(clone_flags & ~CLONE_IDLETASK,
-                   usp, (struct pt_regs *) (swstack+1), 0);
+       p = do_fork(clone_flags & ~CLONE_IDLETASK, usp, u_regs, 0, user_tid);
        return IS_ERR(p) ? PTR_ERR(p) : p->pid;
 }
 
@@ -274,7 +276,7 @@ alpha_vfork(struct switch_stack * swstack)
 {
        struct task_struct *p;
        p = do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, rdusp(),
-                   (struct pt_regs *) (swstack+1), 0);
+                   (struct pt_regs *) (swstack+1), 0, NULL);
        return IS_ERR(p) ? PTR_ERR(p) : p->pid;
 }
 

diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c
index b328c280aa95723311d68516a42d0a80bd57127b..160a9ba454ae31b16cb34d96bb4a4650e1cee2de 100644 (file)
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -432,7 +432,7 @@ fork_by_hand(void)
        /* Don't care about the contents of regs since we'll never
           reschedule the forked task. */
        struct pt_regs regs;
-       return do_fork(CLONE_VM|CLONE_IDLETASK, 0, &regs, 0);
+       return do_fork(CLONE_VM|CLONE_IDLETASK, 0, &regs, 0, NULL);
 }
 
 /*

diff --git a/include/asm-alpha/ide.h b/include/asm-alpha/ide.h
index 63bb9f785498b31e7f24ed8c4425f49b86860420..0ca863142cf5ace3d25731d6d3d4c49d0faee031 100644 (file)
--- a/include/asm-alpha/ide.h
+++ b/include/asm-alpha/ide.h
@@ -80,6 +80,17 @@ static __inline__ void ide_init_default_hwifs(void)
 #endif
 }
 
+#define ide_request_irq(irq,hand,flg,dev,id)   request_irq((irq),(hand),(flg),(dev),(id))
+#define ide_free_irq(irq,dev_id)               free_irq((irq), (dev_id))
+#define ide_check_region(from,extent)          check_region((from), (extent))
+#define ide_request_region(from,extent,name)   request_region((from), (extent), (name))
+#define ide_release_region(from,extent)                release_region((from), (extent))
+
+#define ide_ack_intr(hwif)             (1)
+#define ide_fix_driveid(id)            do {} while (0)
+#define ide_release_lock(lock)         do {} while (0)
+#define ide_get_lock(lock, hdlr, data) do {} while (0)
+
 #endif /* __KERNEL__ */
 
 #endif /* __ASMalpha_IDE_H */

diff --git a/include/asm-alpha/kmap_types.h b/include/asm-alpha/kmap_types.h
new file mode 100644 (file)
index 0000000..3e755b9
--- /dev/null
+++ b/include/asm-alpha/kmap_types.h
@@ -0,0 +1,31 @@
+#ifndef _ASM_KMAP_TYPES_H
+#define _ASM_KMAP_TYPES_H
+
+/* Dummy header just to define km_type. */
+
+#include <linux/config.h>
+
+#if CONFIG_DEBUG_HIGHMEM
+# define D(n) __KM_FENCE_##n ,
+#else
+# define D(n)
+#endif
+
+enum km_type {
+D(0)   KM_BOUNCE_READ,
+D(1)   KM_SKB_SUNRPC_DATA,
+D(2)   KM_SKB_DATA_SOFTIRQ,
+D(3)   KM_USER0,
+D(4)   KM_USER1,
+D(5)   KM_BIO_SRC_IRQ,
+D(6)   KM_BIO_DST_IRQ,
+D(7)   KM_PTE0,
+D(8)   KM_PTE1,
+D(9)   KM_IRQ0,
+D(10)  KM_IRQ1,
+D(11)  KM_TYPE_NR
+};
+
+#undef D
+
+#endif

diff --git a/include/asm-alpha/user.h b/include/asm-alpha/user.h
index c5519bf162d7a6af35b118a9e12f1bf1c9ea76a6..7e417fc9d4916a0f91f9799686f9fa307a9cfe61 100644 (file)
--- a/include/asm-alpha/user.h
+++ b/include/asm-alpha/user.h
@@ -1,6 +1,7 @@
 #ifndef _ALPHA_USER_H
 #define _ALPHA_USER_H
 
+#include <linux/sched.h>
 #include <linux/ptrace.h>
 
 #include <asm/page.h>