diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-04 11:05:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-04 11:05:13 -0800 |
| commit | ef66f6b8e3f585ab6c42ed49c5f2e7d2d88bb43e (patch) | |
| tree | b92089f8835ac515f68be344642bcb9daae0a0a8 /arch/ia64/include/asm | |
| parent | b92f3d32e098a39c2136ee0729174e829a1cf335 (diff) | |
| parent | 240b62d381fe5b66c496a6fd55edff3976a9be51 (diff) | |
Merge tag 'please-pull-misc-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 update from Tony Luck:
"Cleanup some leftover para-virtualization pieces"
* tag 'please-pull-misc-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
ia64: remove stale paravirt leftovers
Diffstat (limited to 'arch/ia64/include/asm')
| -rw-r--r-- | arch/ia64/include/asm/irqflags.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/ia64/include/asm/irqflags.h b/arch/ia64/include/asm/irqflags.h index d97f8435be4f..1dc30f12e545 100644 --- a/arch/ia64/include/asm/irqflags.h +++ b/arch/ia64/include/asm/irqflags.h @@ -36,11 +36,7 @@ static inline void arch_maybe_save_ip(unsigned long flags) static inline unsigned long arch_local_save_flags(void) { ia64_stop(); -#ifdef CONFIG_PARAVIRT - return ia64_get_psr_i(); -#else return ia64_getreg(_IA64_REG_PSR); -#endif } static inline unsigned long arch_local_irq_save(void) |