diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-31 22:22:27 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-31 22:22:27 +0000 |
| commit | 825423e4c4f18289df2393951cfd2a7a31fc0464 (patch) | |
| tree | 4ad80e981c3d9effa910d2247d118d254f9a5d09 /arch/alpha | |
| parent | c4693dc4856ab907a5c02187a8d398861bebfc7e (diff) | |
Merge with Linux 2.4.1.
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/kernel/Makefile | 8 | ||||
| -rw-r--r-- | arch/alpha/kernel/osf_sys.c | 1 | ||||
| -rw-r--r-- | arch/alpha/kernel/signal.c | 1 | ||||
| -rw-r--r-- | arch/alpha/kernel/sys_cabriolet.c | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/arch/alpha/kernel/Makefile b/arch/alpha/kernel/Makefile index 85cc7ed48..abc04cca2 100644 --- a/arch/alpha/kernel/Makefile +++ b/arch/alpha/kernel/Makefile @@ -23,7 +23,7 @@ obj-y := entry.o traps.o process.o osf_sys.o irq.o irq_alpha.o \ # FIXME! # These should be made conditional on the stuff that needs them! # -obj-y += irq_i8259.o irq_srm.o irq_pyxis.o \ +obj-y += irq_i8259.o irq_srm.o \ es1888.o smc37c669.o smc37c93x.o ns87312.o ifdef CONFIG_VGA_HOSE @@ -43,7 +43,7 @@ obj-y += core_apecs.o core_cia.o core_irongate.o core_lca.o core_mcpcia.o \ sys_jensen.o sys_miata.o sys_mikasa.o sys_nautilus.o sys_titan.o \ sys_noritake.o sys_rawhide.o sys_ruffian.o sys_rx164.o \ sys_sable.o sys_sio.o sys_sx164.o sys_takara.o sys_rx164.o \ - sys_wildfire.o core_wildfire.o + sys_wildfire.o core_wildfire.o irq_pyxis.o else @@ -94,6 +94,10 @@ obj-$(CONFIG_ALPHA_SX164) += sys_sx164.o obj-$(CONFIG_ALPHA_TAKARA) += sys_takara.o obj-$(CONFIG_ALPHA_WILDFIRE) += sys_wildfire.o +ifneq ($(CONFIG_ALPHA_MIATA)$(CONFIG_ALPHA_RUFFIAN)$(CONFIG_ALPHA_SX164),) +obj-y += irq_pyxis.o +endif + endif # GENERIC all: kernel.o head.o diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index 4d574b824..cd28b07fc 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c @@ -904,7 +904,6 @@ extern int do_sys_settimeofday(struct timeval *tv, struct timezone *tz); extern int do_getitimer(int which, struct itimerval *value); extern int do_setitimer(int which, struct itimerval *, struct itimerval *); asmlinkage int sys_utimes(char *, struct timeval *); -extern int sys_wait4(pid_t, int *, int, struct rusage *); extern int do_adjtimex(struct timex *); struct timeval32 diff --git a/arch/alpha/kernel/signal.c b/arch/alpha/kernel/signal.c index 73df1e930..e3d75f7a1 100644 --- a/arch/alpha/kernel/signal.c +++ b/arch/alpha/kernel/signal.c @@ -30,7 +30,6 @@ #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) -asmlinkage int sys_wait4(int, int *, int, struct rusage *); asmlinkage void ret_from_sys_call(void); asmlinkage int do_signal(sigset_t *, struct pt_regs *, struct switch_stack *, unsigned long, unsigned long); diff --git a/arch/alpha/kernel/sys_cabriolet.c b/arch/alpha/kernel/sys_cabriolet.c index 624c6732c..58a8f4658 100644 --- a/arch/alpha/kernel/sys_cabriolet.c +++ b/arch/alpha/kernel/sys_cabriolet.c @@ -42,7 +42,7 @@ static inline void cabriolet_update_irq_hw(unsigned int irq, unsigned long mask) { int ofs = (irq - 16) / 8; - outb(mask >> (16 + ofs*3), 0x804 + ofs); + outb(mask >> (16 + ofs * 8), 0x804 + ofs); } static inline void |