Re: 2.6.13-rc6-rt6

Steven Rostedt
2005-08-16T18:50:58Z

On Tue, 2005-08-16 at 14:07 -0400, Steven Rostedt wrote:
> On Tue, 2005-08-16 at 13:50 -0400, Steven Rostedt wrote:
>
> > I changed it for now to the following, but it still desn't make sense to
> > me. With a local_save_flags, which doesn't disable or restore the
> > interrupts, why bother with the trace at all?
>
> Or should the following patch really be applied? (it boots and compiles
> nicely).
>

Since the change made raw_local_save_flags the same for both PREEMPT_RT
and !PREEMPT_RT, I moved it out of the #ifdef altogether. The
__raw_local_save_flags already does the type checking (at least for
intel).

-- Steve

Index: linux_realtime_ernie/include/linux/rt_irq.h
===================================================================
--- linux_realtime_ernie/include/linux/rt_irq.h (revision 294)
+++ linux_realtime_ernie/include/linux/rt_irq.h (working copy)
@@ -26,7 +26,6 @@
# endif

/* soft state does not follow the hard state */
-# define raw_local_save_flags(flags) do { typecheck(unsigned long,flags); if (raw_irqs_disabled_flags(flags)) trace_irqs_off(); else trace_irqs_on(); __raw_local_save_flags(flags); } while (0)
# define raw_local_irq_enable() do { trace_irqs_on(); __raw_local_irq_enable(); } while (0)
# define raw_local_irq_disable() do { __raw_local_irq_disable(); trace_irqs_off(); } while (0)
# define raw_local_irq_save(flags) do { __raw_local_irq_save(flags); trace_irqs_off(); } while (0)
@@ -35,7 +34,6 @@
# define raw_safe_halt() __raw_safe_halt()
#else
# define RAW_LOCAL_ILLEGAL_MASK 0UL
-# define raw_local_save_flags __raw_local_save_flags
# define raw_local_irq_enable __raw_local_irq_enable
# define raw_local_irq_disable __raw_local_irq_disable
# define raw_local_irq_save __raw_local_irq_save
@@ -50,6 +48,7 @@
# define irqs_disabled_flags __raw_irqs_disabled_flags
#endif

+#define raw_local_save_flags __raw_local_save_flags
#define raw_irqs_disabled __raw_irqs_disabled
#define raw_irqs_disabled_flags __raw_irqs_disabled_flags