Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c56250f authored by Rui Sousa's avatar Rui Sousa Committed by Ingo Molnar
Browse files

lockdep, UML: fix compilation when CONFIG_TRACE_IRQFLAGS_SUPPORT is not set 



Hiroshi Shimamoto reported:

> > !TRACE_IRQFLAGS_SUPPORT mode of build for future work, it can be
> > restored via a simple revert.
>
> Hi, it seems that this patch breaks uml build.
>
> kernel/printk.c: In function 'vprintk':
> kernel/printk.c:674: error: implicit declaration of function
> 'raw_local_irq_save' kernel/printk.c:772: error: implicit declaration of
> function 'raw_local_irq_restore'

With the patch bellow it compiles (make ARCH=um with a x86 host), but I'm
really out of my league on this one...

Reported-by: default avatarHiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent cdad7220

include/asm-um/system-generic.h

+16 −16
Original line number Diff line number Diff line
@@ -4,15 +4,15 @@ 
#include "asm/arch/system.h"



#undef switch_to

#undef local_irq_save

#undef local_irq_restore

#undef local_irq_disable

#undef local_irq_enable

#undef local_save_flags

#undef local_irq_restore

#undef local_irq_enable

#undef local_irq_disable

#undef local_irq_save

#undef raw_local_irq_save

#undef raw_local_irq_restore

#undef raw_local_irq_disable

#undef raw_local_irq_enable

#undef raw_local_save_flags

#undef raw_local_irq_restore

#undef raw_local_irq_enable

#undef raw_local_irq_disable

#undef raw_local_irq_save

#undef irqs_disabled



extern void *switch_to(void *prev, void *next, void *last);
@@ -23,21 +23,21 @@ extern int get_signals(void); 
extern void block_signals(void);

extern void unblock_signals(void);



#define local_save_flags(flags) do { typecheck(unsigned long, flags); \

#define raw_local_save_flags(flags) do { typecheck(unsigned long, flags); \

				     (flags) = get_signals(); } while(0)

#define local_irq_restore(flags) do { typecheck(unsigned long, flags); \

#define raw_local_irq_restore(flags) do { typecheck(unsigned long, flags); \

				      set_signals(flags); } while(0)



#define local_irq_save(flags) do { local_save_flags(flags); \

                                   local_irq_disable(); } while(0)

#define raw_local_irq_save(flags) do { raw_local_save_flags(flags); \

                                   raw_local_irq_disable(); } while(0)



#define local_irq_enable() unblock_signals()

#define local_irq_disable() block_signals()

#define raw_local_irq_enable() unblock_signals()

#define raw_local_irq_disable() block_signals()



#define irqs_disabled()                 \

({                                      \

        unsigned long flags;            \

        local_save_flags(flags);        \

        raw_local_save_flags(flags);        \

        (flags == 0);                   \

})