Skip to contentSkip to conversation

make new ide compile

PATCH In review Stelian Pop 2 participants 3 messages Dec 10, 2002

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 =====

include/linux/ide.h +3 -0
@@ -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 */
Signature · 1 line
Stelian Pop <[email protected]>
#1 lore raw

include/linux/ide.h line 1761

Quoted 11 lines · Stelian Pop

===== include/linux/ide.h 1.7 vs edited =====

include/linux/ide.h +3 -0
@@ -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

#2 lore raw
Quoted 8 lines · Alan Cox
Quoted 7 lines · Stelian Pop

===== include/linux/ide.h 1.7 vs edited =====

include/linux/ide.h +0 -0
@@ -1755,5 +1755,8 @@
 #define ide_lock		(io_request_lock)
 #define DRIVE_LOCK(drive)       ((drive)->queue.queue_lock)
 
Quoted 6 lines

include/linux/ide.h line 1761

Quoted 4 lines
include/linux/ide.h +3 -0
+#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.

Signature · 1 line
Stelian Pop <[email protected]>