Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 7483cb7bbc02b9471dda28e54f41287d5374e3ac

Authored by Al Viro
Committed by Linus Torvalds
1 parent 22409f9c80
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

uml got broken by commit 30742d5c2277c325fb0e9d2d817d55a19995fe8f 

... if you revert a commit, revert the fixups elsewhere that had been
triggered by it.  Such as 8c56250f48347750c82ab18d98d647dcf99ca674
(lockdep, UML: fix compilation when CONFIG_TRACE_IRQFLAGS_SUPPORT is not set).

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 7 additions and 7 deletions Side-by-side Diff

arch/um/include/asm/system.h
Diff comments   View file @ 7483cb7
... ... @@ -11,21 +11,21 @@
11 11 extern void block_signals(void);
12 12 extern void unblock_signals(void);
13 13  
14   -#define raw_local_save_flags(flags) do { typecheck(unsigned long, flags); \
  14 +#define local_save_flags(flags) do { typecheck(unsigned long, flags); \
15 15 (flags) = get_signals(); } while(0)
16   -#define raw_local_irq_restore(flags) do { typecheck(unsigned long, flags); \
  16 +#define local_irq_restore(flags) do { typecheck(unsigned long, flags); \
17 17 set_signals(flags); } while(0)
18 18  
19   -#define raw_local_irq_save(flags) do { raw_local_save_flags(flags); \
20   - raw_local_irq_disable(); } while(0)
  19 +#define local_irq_save(flags) do { local_save_flags(flags); \
  20 + local_irq_disable(); } while(0)
21 21  
22   -#define raw_local_irq_enable() unblock_signals()
23   -#define raw_local_irq_disable() block_signals()
  22 +#define local_irq_enable() unblock_signals()
  23 +#define local_irq_disable() block_signals()
24 24  
25 25 #define irqs_disabled() \
26 26 ({ \
27 27 unsigned long flags; \
28   - raw_local_save_flags(flags); \
  28 + local_save_flags(flags); \
29 29 (flags == 0); \
30 30 })
31 31