diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 11:25:41 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 11:25:41 +0900 |
| commit | 18a022de47bc11ee20d7d0f4dd72d42d2cfdc51c (patch) | |
| tree | 84e178e4e475400f8e9a5c74f1e2cb35ee17fca4 /include | |
| parent | 02a650e2820e19fde8f6a49752027217fdd33d78 (diff) | |
| parent | d23b5799b608112bb799c9b0e1e11ee1da692d76 (diff) | |
| download | linux-3.10-18a022de47bc11ee20d7d0f4dd72d42d2cfdc51c.tar.gz linux-3.10-18a022de47bc11ee20d7d0f4dd72d42d2cfdc51c.tar.bz2 linux-3.10-18a022de47bc11ee20d7d0f4dd72d42d2cfdc51c.zip | |
Merge tag 'for-3.7' of git://openrisc.net/jonas/linux
Pull OpenRISC updates from Jonas Bonn:
"Fixups for some corner cases, build issues, and some obvious bugs in
IRQ handling. No major changes."
* tag 'for-3.7' of git://openrisc.net/jonas/linux:
openrisc: mask interrupts in irq_mask_ack function
openrisc: fix typos in comments and warnings
openrisc: PIC should act on domain-local irqs
openrisc: Make cpu_relax() invoke barrier()
audit: define AUDIT_ARCH_OPENRISC
openrisc: delay: fix handling of counter overflow
openrisc: delay: fix loops calculation for __const_udelay
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/audit.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/audit.h b/include/linux/audit.h index e5884f950b4..b889fa64b0e 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -337,6 +337,7 @@ enum { #define AUDIT_ARCH_MIPSEL (EM_MIPS|__AUDIT_ARCH_LE) #define AUDIT_ARCH_MIPS64 (EM_MIPS|__AUDIT_ARCH_64BIT) #define AUDIT_ARCH_MIPSEL64 (EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) +#define AUDIT_ARCH_OPENRISC (EM_OPENRISC) #define AUDIT_ARCH_PARISC (EM_PARISC) #define AUDIT_ARCH_PARISC64 (EM_PARISC|__AUDIT_ARCH_64BIT) #define AUDIT_ARCH_PPC (EM_PPC) |