* Re: Big Bada Boom...
2001-01-24 18:21 ` Ivan Kokshaysky
@ 2001-01-25 3:02 ` Greg from Systems
2001-01-25 3:12 ` Greg from Systems
2001-01-25 4:34 ` Las message I promise Greg from Systems
2 siblings, 0 replies; 11+ messages in thread
From: Greg from Systems @ 2001-01-25 3:02 UTC (permalink / raw)
To: Ivan Kokshaysky; +Cc: Peter Rival, Richard Henderson, linux-kernel
Sorry it took so long to get back to you on this:
I applied the patch and now am getting this:
alpha_ksyms.c: At top level:
alpha_ksyms.c:133: `sys_wait4' undeclared here (not in a function)
alpha_ksyms.c:133: initializer element for `__ksymtab_sys_wait4.value' is not constant
make[1]: *** [alpha_ksyms.o] Error 1
make[1]: Leaving directory `/usr/src/linux/arch/alpha/kernel'
make: *** [_dir_arch/alpha/kernel] Error 2
On Wed, 24 Jan 2001, Ivan Kokshaysky wrote:
> On Wed, Jan 24, 2001 at 08:23:13AM -0500, Peter Rival wrote:
> > Yeah, I've been bitten by this quite often. Basically, just edit arch/alpha/kernel/Makefile and remove irq_pyxis.c from the obj-y
> > line. I'm not positive what systems require it exactly, but rawhide isn't one of them. I have a totally separate patch from Andrea
> > that suggests (to my mind) that it is required for: GENERIC, CIA, CABRIOLET, EV164, EB66P, LX164, PC164, MIATA, RUFFIAN and SX164. Does
> > someone want to verify that and then a quickie patch can be whipped up and sent in.
>
> irq_pyxis.c is needed only for generic, miata, ruffian and sx164.
> Here is also cabriolet IRQ fix and compile fix for 2.4.1-pre10.
>
> Ivan.
>
> --- 2.4.1p10/arch/alpha/kernel/Makefile Sat Dec 30 01:07:19 2000
> +++ linux/arch/alpha/kernel/Makefile Wed Jan 24 20:50:57 2001
> @@ -23,7 +23,7 @@ obj-y := entry.o traps.o process.o os
> # 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_
> 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
>
> @@ -93,6 +93,10 @@ endif
> 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
>
> --- 2.4.1p10/arch/alpha/kernel/sys_cabriolet.c Fri Oct 27 21:55:01 2000
> +++ linux/arch/alpha/kernel/sys_cabriolet.c Fri Dec 29 15:28:35 2000
> @@ -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
> --- 2.4.1p10/arch/alpha/kernel/osf_sys.c Mon Jan 8 18:05:38 2001
> +++ linux/arch/alpha/kernel/osf_sys.c Wed Jan 24 16:03:18 2001
> @@ -906,7 +906,6 @@ extern int do_sys_settimeofday(struct ti
> 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
> --- 2.4.1p10/arch/alpha/kernel/signal.c Sun Sep 3 22:48:33 2000
> +++ linux/arch/alpha/kernel/signal.c Wed Jan 24 16:05:14 2001
> @@ -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);
> --- 2.4.1p10/include/asm-alpha/unistd.h Mon Jan 22 19:47:59 2001
> +++ linux/include/asm-alpha/unistd.h Wed Jan 24 15:46:56 2001
> @@ -572,7 +572,6 @@ static inline long sync(void)
> return sys_sync();
> }
>
> -extern long sys_wait4(int, int *, int, struct rusage *);
> static inline pid_t waitpid(int pid, int * wait_stat, int flags)
> {
> return sys_wait4(pid, wait_stat, flags, NULL);
>
----------------------------------------------------------------------------
IGNOTUM PER IGNOTIUS
"Grasshopper always wrong in argument with chicken"
The "socratic approach" is what you call starting an argument by
asking questions.
The human race will begin solving it's problems on the day that it
ceases taking itself so seriously.
PRINCIPIA DISCORDIA
Published by POEE Head Temple - San Francisco
" On The Future Site of Beautiful
San Andreas Canyon"
Please do not use this
document as toilet tissue
Fnord
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: Big Bada Boom...
2001-01-24 18:21 ` Ivan Kokshaysky
2001-01-25 3:02 ` Greg from Systems
@ 2001-01-25 3:12 ` Greg from Systems
2001-01-25 4:34 ` Las message I promise Greg from Systems
2 siblings, 0 replies; 11+ messages in thread
From: Greg from Systems @ 2001-01-25 3:12 UTC (permalink / raw)
To: Ivan Kokshaysky; +Cc: Peter Rival, Richard Henderson, linux-kernel
Found a fix
leave the :
extern long sys_wait4(int, int *, int, struct rusage *);
line in:
linux/include/asm-alpha/unistd.h
On Wed, 24 Jan 2001, Ivan Kokshaysky wrote:
> On Wed, Jan 24, 2001 at 08:23:13AM -0500, Peter Rival wrote:
> > Yeah, I've been bitten by this quite often. Basically, just edit arch/alpha/kernel/Makefile and remove irq_pyxis.c from the obj-y
> > line. I'm not positive what systems require it exactly, but rawhide isn't one of them. I have a totally separate patch from Andrea
> > that suggests (to my mind) that it is required for: GENERIC, CIA, CABRIOLET, EV164, EB66P, LX164, PC164, MIATA, RUFFIAN and SX164. Does
> > someone want to verify that and then a quickie patch can be whipped up and sent in.
>
> irq_pyxis.c is needed only for generic, miata, ruffian and sx164.
> Here is also cabriolet IRQ fix and compile fix for 2.4.1-pre10.
>
> Ivan.
>
> --- 2.4.1p10/arch/alpha/kernel/Makefile Sat Dec 30 01:07:19 2000
> +++ linux/arch/alpha/kernel/Makefile Wed Jan 24 20:50:57 2001
> @@ -23,7 +23,7 @@ obj-y := entry.o traps.o process.o os
> # 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_
> 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
>
> @@ -93,6 +93,10 @@ endif
> 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
>
> --- 2.4.1p10/arch/alpha/kernel/sys_cabriolet.c Fri Oct 27 21:55:01 2000
> +++ linux/arch/alpha/kernel/sys_cabriolet.c Fri Dec 29 15:28:35 2000
> @@ -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
> --- 2.4.1p10/arch/alpha/kernel/osf_sys.c Mon Jan 8 18:05:38 2001
> +++ linux/arch/alpha/kernel/osf_sys.c Wed Jan 24 16:03:18 2001
> @@ -906,7 +906,6 @@ extern int do_sys_settimeofday(struct ti
> 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
> --- 2.4.1p10/arch/alpha/kernel/signal.c Sun Sep 3 22:48:33 2000
> +++ linux/arch/alpha/kernel/signal.c Wed Jan 24 16:05:14 2001
> @@ -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);
> --- 2.4.1p10/include/asm-alpha/unistd.h Mon Jan 22 19:47:59 2001
> +++ linux/include/asm-alpha/unistd.h Wed Jan 24 15:46:56 2001
> @@ -572,7 +572,6 @@ static inline long sync(void)
> return sys_sync();
> }
>
> -extern long sys_wait4(int, int *, int, struct rusage *);
> static inline pid_t waitpid(int pid, int * wait_stat, int flags)
> {
> return sys_wait4(pid, wait_stat, flags, NULL);
>
----------------------------------------------------------------------------
IGNOTUM PER IGNOTIUS
"Grasshopper always wrong in argument with chicken"
The "socratic approach" is what you call starting an argument by
asking questions.
The human race will begin solving it's problems on the day that it
ceases taking itself so seriously.
PRINCIPIA DISCORDIA
Published by POEE Head Temple - San Francisco
" On The Future Site of Beautiful
San Andreas Canyon"
Please do not use this
document as toilet tissue
Fnord
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 11+ messages in thread* Las message I promise...
2001-01-24 18:21 ` Ivan Kokshaysky
2001-01-25 3:02 ` Greg from Systems
2001-01-25 3:12 ` Greg from Systems
@ 2001-01-25 4:34 ` Greg from Systems
2001-01-25 11:07 ` Ivan Kokshaysky
2 siblings, 1 reply; 11+ messages in thread
From: Greg from Systems @ 2001-01-25 4:34 UTC (permalink / raw)
To: Ivan Kokshaysky; +Cc: Peter Rival, Richard Henderson, linux-kernel
Ok:
calypso 47# uname -a
Linux calypso 2.4.0 #6 SMP Wed Jan 24 20:00:01 PST 2001 alpha unknown
calypso 48#
I used the patch at the bottom of this except for the part that patches:
linux/include/asm-alpha/unistd.h
Thanks much for your help on that... Slackware is rocking away on my
Alpha Server 4100...
I don't know who this should go to, but the only other thing I can find
wrong is that de4x5 is completely jacked... It panic the OS if compiled
in or loaded as a module..... I can get the panic info if anyone needs it
or pass it along to whoever might need it.... tulip is working fine in
it's place.... but I was kinda hoping to use the real module..
Thanks again for the help
On Wed, 24 Jan 2001, Ivan Kokshaysky wrote:
> On Wed, Jan 24, 2001 at 08:23:13AM -0500, Peter Rival wrote:
> > Yeah, I've been bitten by this quite often. Basically, just edit arch/alpha/kernel/Makefile and remove irq_pyxis.c from the obj-y
> > line. I'm not positive what systems require it exactly, but rawhide isn't one of them. I have a totally separate patch from Andrea
> > that suggests (to my mind) that it is required for: GENERIC, CIA, CABRIOLET, EV164, EB66P, LX164, PC164, MIATA, RUFFIAN and SX164. Does
> > someone want to verify that and then a quickie patch can be whipped up and sent in.
>
> irq_pyxis.c is needed only for generic, miata, ruffian and sx164.
> Here is also cabriolet IRQ fix and compile fix for 2.4.1-pre10.
>
> Ivan.
>
> --- 2.4.1p10/arch/alpha/kernel/Makefile Sat Dec 30 01:07:19 2000
> +++ linux/arch/alpha/kernel/Makefile Wed Jan 24 20:50:57 2001
> @@ -23,7 +23,7 @@ obj-y := entry.o traps.o process.o os
> # 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_
> 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
>
> @@ -93,6 +93,10 @@ endif
> 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
>
> --- 2.4.1p10/arch/alpha/kernel/sys_cabriolet.c Fri Oct 27 21:55:01 2000
> +++ linux/arch/alpha/kernel/sys_cabriolet.c Fri Dec 29 15:28:35 2000
> @@ -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
> --- 2.4.1p10/arch/alpha/kernel/osf_sys.c Mon Jan 8 18:05:38 2001
> +++ linux/arch/alpha/kernel/osf_sys.c Wed Jan 24 16:03:18 2001
> @@ -906,7 +906,6 @@ extern int do_sys_settimeofday(struct ti
> 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
> --- 2.4.1p10/arch/alpha/kernel/signal.c Sun Sep 3 22:48:33 2000
> +++ linux/arch/alpha/kernel/signal.c Wed Jan 24 16:05:14 2001
> @@ -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);
> --- 2.4.1p10/include/asm-alpha/unistd.h Mon Jan 22 19:47:59 2001
> +++ linux/include/asm-alpha/unistd.h Wed Jan 24 15:46:56 2001
> @@ -572,7 +572,6 @@ static inline long sync(void)
> return sys_sync();
> }
>
> -extern long sys_wait4(int, int *, int, struct rusage *);
> static inline pid_t waitpid(int pid, int * wait_stat, int flags)
> {
> return sys_wait4(pid, wait_stat, flags, NULL);
>
----------------------------------------------------------------------------
IGNOTUM PER IGNOTIUS
"Grasshopper always wrong in argument with chicken"
The "socratic approach" is what you call starting an argument by
asking questions.
The human race will begin solving it's problems on the day that it
ceases taking itself so seriously.
PRINCIPIA DISCORDIA
Published by POEE Head Temple - San Francisco
" On The Future Site of Beautiful
San Andreas Canyon"
Please do not use this
document as toilet tissue
Fnord
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: Las message I promise...
2001-01-25 4:34 ` Las message I promise Greg from Systems
@ 2001-01-25 11:07 ` Ivan Kokshaysky
0 siblings, 0 replies; 11+ messages in thread
From: Ivan Kokshaysky @ 2001-01-25 11:07 UTC (permalink / raw)
To: Greg from Systems; +Cc: Peter Rival, Richard Henderson, linux-kernel
On Wed, Jan 24, 2001 at 08:34:51PM -0800, Greg from Systems wrote:
> calypso 47# uname -a
> Linux calypso 2.4.0 #6 SMP Wed Jan 24 20:00:01 PST 2001 alpha unknown
^^^^^
...
> I used the patch at the bottom of this except for the part that patches:
> linux/include/asm-alpha/unistd.h
The part of the patch removing sys_wait4() definitions isn't needed
for kernels earlier than 2.4.1-pre10. In pre10 sys_wait4() defined
in include/linux/sched.h.
Ivan.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 11+ messages in thread