← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise-security

« back to all changes in this revision

Viewing changes to arch/x86/include/asm/irqflags.h

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/x86/include/asm/irqflags.h
60
60
#include <asm/paravirt.h>
61
61
#else
62
62
#ifndef __ASSEMBLY__
 
63
#include <linux/types.h>
63
64
 
64
 
static inline unsigned long arch_local_save_flags(void)
 
65
static inline notrace unsigned long arch_local_save_flags(void)
65
66
{
66
67
        return native_save_fl();
67
68
}
68
69
 
69
 
static inline void arch_local_irq_restore(unsigned long flags)
 
70
static inline notrace void arch_local_irq_restore(unsigned long flags)
70
71
{
71
72
        native_restore_fl(flags);
72
73
}
73
74
 
74
 
static inline void arch_local_irq_disable(void)
 
75
static inline notrace void arch_local_irq_disable(void)
75
76
{
76
77
        native_irq_disable();
77
78
}
78
79
 
79
 
static inline void arch_local_irq_enable(void)
 
80
static inline notrace void arch_local_irq_enable(void)
80
81
{
81
82
        native_irq_enable();
82
83
}
102
103
/*
103
104
 * For spinlocks, etc:
104
105
 */
105
 
static inline unsigned long arch_local_irq_save(void)
 
106
static inline notrace unsigned long arch_local_irq_save(void)
106
107
{
107
108
        unsigned long flags = arch_local_save_flags();
108
109
        arch_local_irq_disable();