2002-12-10 14:42:09

by Stelian Pop

Subject: [PATCH 2.4.20-BK] make new ide compile

The new ide code in the latest BK 2.4 kernel does not compile.

Several symbols: local_save_flags, save_and_cli, local_irq_set
are not defined, probably due to a missing merge somewhere in
include/asm-*/system.h.

The attached (dirty) patch makes it compile again. Just in case
somebody else needs it, while waiting for the proper fix.

Stelian.

===== include/linux/ide.h 1.7 vs edited =====
--- 1.7/include/linux/ide.h Fri Nov 29 23:03:01 2002
+++ edited/include/linux/ide.h Tue Dec 10 12:20:01 2002
@@ -1755,5 +1755,8 @@
#define ide_lock (io_request_lock)
#define DRIVE_LOCK(drive) ((drive)->queue.queue_lock)

+#define local_save_flags(flags) save_flags((flags))
+#define save_and_cli(x) local_irq_save(x)
+#define local_irq_set(flags) do { local_save_flags((flags)); local_irq_enable(); } while (0)

#endif /* _IDE_H */
--
Stelian Pop <[email protected]>

2002-12-10 15:25:02

by Alan

Subject: Re: [PATCH 2.4.20-BK] make new ide compile

On Tue, 2002-12-10 at 14:49, Stelian Pop wrote:
> ===== include/linux/ide.h 1.7 vs edited =====
> --- 1.7/include/linux/ide.h Fri Nov 29 23:03:01 2002
> +++ edited/include/linux/ide.h Tue Dec 10 12:20:01 2002
> @@ -1755,5 +1755,8 @@
> #define ide_lock (io_request_lock)
> #define DRIVE_LOCK(drive) ((drive)->queue.queue_lock)
>
> +#define local_save_flags(flags) save_flags((flags))
> +#define save_and_cli(x) local_irq_save(x)
> +#define local_irq_set(flags) do { local_save_flags((flags)); local_irq_enable(); } while (0)
>

Please don't apply these changes. Use the ones from -ac

2002-12-10 15:31:53

by Stelian Pop

Subject: Re: [PATCH 2.4.20-BK] make new ide compile

On Tue, Dec 10, 2002 at 04:07:00PM +0000, Alan Cox wrote:

> On Tue, 2002-12-10 at 14:49, Stelian Pop wrote:
> > ===== include/linux/ide.h 1.7 vs edited =====
> > --- 1.7/include/linux/ide.h Fri Nov 29 23:03:01 2002
> > +++ edited/include/linux/ide.h Tue Dec 10 12:20:01 2002
> > @@ -1755,5 +1755,8 @@
> > #define ide_lock (io_request_lock)
> > #define DRIVE_LOCK(drive) ((drive)->queue.queue_lock)
> >
> > +#define local_save_flags(flags) save_flags((flags))
> > +#define save_and_cli(x) local_irq_save(x)
> > +#define local_irq_set(flags) do { local_save_flags((flags)); local_irq_enable(); } while (0)
> >
>
> Please don't apply these changes. Use the ones from -ac

As I said, it is just the dirty patch making it compile (and run),
while waiting for the proper fix.

It was never intended for integration in any tree, of course :-)

Stelian.
--
Stelian Pop <[email protected]>