diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 14:09:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 14:09:27 -0400 |
commit | 76d3f4c27d3c2c85e5cfe731537b6929145bf652 (patch) | |
tree | 80d6dd04ad832122f69edaad710252d771e39c1b /arch/arc/include/asm/irqflags.h | |
parent | c1101cbc7db316dcdc94d344727fd372622d0ce7 (diff) | |
parent | baadb8fd0c62540f2ffb2d0f12b8a47c7975562b (diff) |
Merge tag 'arc-v3.11-rc1-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull first batch of ARC changes from Vineet Gupta:
"There's a second bunch to follow next week - which depends on commits
on other trees (irq/net). I'd have preferred the accompanying ARC
change via respective trees, but it didn't workout somehow.
Highlights of changes:
- Continuation of ARC MM changes from 3.10 including
zero page optimization
Setting pagecache pages dirty by default
Non executable stack by default
Reducing dcache flushes for aliasing VIPT config
- Long overdue rework of pt_regs machinery - removing the unused word
gutters and adding ECR register to baseline (helps cleanup lot of
low level code)
- Support for ARC gcc 4.8
- Few other preventive fixes, cosmetics, usage of Kconfig helper..
The diffstat is larger than normal primarily because of arcregs.h
header split as well as beautification of macros in entry.h"
* tag 'arc-v3.11-rc1-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: (32 commits)
ARC: warn on improper stack unwind FDE entries
arc: delete __cpuinit usage from all arc files
ARC: [tlb-miss] Fix bug with CONFIG_ARC_DBG_TLB_MISS_COUNT
ARC: [tlb-miss] Extraneous PTE bit testing/setting
ARC: Adjustments for gcc 4.8
ARC: Setup Vector Table Base in early boot
ARC: Remove explicit passing around of ECR
ARC: pt_regs update #5: Use real ECR for pt_regs->event vs. synth values
ARC: stop using pt_regs->orig_r8
ARC: pt_regs update #4: r25 saved/restored unconditionally
ARC: K/U SP saved from one location in stack switching macro
ARC: Entry Handler tweaks: Simplify branch for in-kernel preemption
ARC: Entry Handler tweaks: Avoid hardcoded LIMMS for ECR values
ARC: Increase readability of entry handlers
ARC: pt_regs update #3: Remove unused gutter at start of callee_regs
ARC: pt_regs update #2: Remove unused gutter at start of pt_regs
ARC: pt_regs update #1: Align pt_regs end with end of kernel stack page
ARC: pt_regs update #0: remove kernel stack canary
ARC: [mm] Remove @write argument to do_page_fault()
ARC: [mm] Make stack/heap Non-executable by default
...
Diffstat (limited to 'arch/arc/include/asm/irqflags.h')
-rw-r--r-- | arch/arc/include/asm/irqflags.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/arc/include/asm/irqflags.h b/arch/arc/include/asm/irqflags.h index eac071668201..d99f79bcf865 100644 --- a/arch/arc/include/asm/irqflags.h +++ b/arch/arc/include/asm/irqflags.h | |||
@@ -19,6 +19,26 @@ | |||
19 | 19 | ||
20 | #include <asm/arcregs.h> | 20 | #include <asm/arcregs.h> |
21 | 21 | ||
22 | /* status32 Reg bits related to Interrupt Handling */ | ||
23 | #define STATUS_E1_BIT 1 /* Int 1 enable */ | ||
24 | #define STATUS_E2_BIT 2 /* Int 2 enable */ | ||
25 | #define STATUS_A1_BIT 3 /* Int 1 active */ | ||
26 | #define STATUS_A2_BIT 4 /* Int 2 active */ | ||
27 | |||
28 | #define STATUS_E1_MASK (1<<STATUS_E1_BIT) | ||
29 | #define STATUS_E2_MASK (1<<STATUS_E2_BIT) | ||
30 | #define STATUS_A1_MASK (1<<STATUS_A1_BIT) | ||
31 | #define STATUS_A2_MASK (1<<STATUS_A2_BIT) | ||
32 | |||
33 | /* Other Interrupt Handling related Aux regs */ | ||
34 | #define AUX_IRQ_LEV 0x200 /* IRQ Priority: L1 or L2 */ | ||
35 | #define AUX_IRQ_HINT 0x201 /* For generating Soft Interrupts */ | ||
36 | #define AUX_IRQ_LV12 0x43 /* interrupt level register */ | ||
37 | |||
38 | #define AUX_IENABLE 0x40c | ||
39 | #define AUX_ITRIGGER 0x40d | ||
40 | #define AUX_IPULSE 0x415 | ||
41 | |||
22 | #ifndef __ASSEMBLY__ | 42 | #ifndef __ASSEMBLY__ |
23 | 43 | ||
24 | /****************************************************************** | 44 | /****************************************************************** |