History

Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Pull arm64 updates from Catalin Marinas: - Pseudo NMI support for arm64 using GICv3 interrupt priorities - uaccess macros clean-up (unsafe user accessors also merged but reverted, waiting for objtool support on arm64) - ptrace regsets for Pointer Authentication (ARMv8.3) key management - inX() ordering w.r.t. delay() on arm64 and riscv (acks in place by the riscv maintainers) - arm64/perf updates: PMU bindings converted to json-schema, unused variable and misleading comment removed - arm64/debug fixes to ensure checking of the triggering exception level and to avoid the propagation of the UNKNOWN FAR value into the si_code for debug signals - Workaround for Fujitsu A64FX erratum 010001 - lib/raid6 ARM NEON optimisations - NR_CPUS now defaults to 256 on arm64 - Minor clean-ups (documentation/comments, Kconfig warning, unused asm-offsets, clang warnings) - MAINTAINERS update for list information to the ARM64 ACPI entry * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (54 commits) arm64: mmu: drop paging_init comments arm64: debug: Ensure debug handlers check triggering exception level arm64: debug: Don't propagate UNKNOWN FAR into si_code for debug signals Revert "arm64: uaccess: Implement unsafe accessors" arm64: avoid clang warning about self-assignment arm64: Kconfig.platforms: fix warning unmet direct dependencies lib/raid6: arm: optimize away a mask operation in NEON recovery routine lib/raid6: use vdupq_n_u8 to avoid endianness warnings arm64: io: Hook up __io_par() for inX() ordering riscv: io: Update __io_[p]ar() macros to take an argument asm-generic/io: Pass result of I/O accessor to __io_[p]ar() arm64: Add workaround for Fujitsu A64FX erratum 010001 arm64: Rename get_thread_info() arm64: Remove documentation about TIF_USEDFPU arm64: irqflags: Fix clang build warnings arm64: Enable the support of pseudo-NMIs arm64: Skip irqflags tracing for NMI in IRQs disabled context arm64: Skip preemption when exiting an NMI arm64: Handle serror in NMI context irqchip/gic-v3: Allow interrupts to be set as pseudo-NMI ...

Linus Torvalds committed 7 years ago

Commit 3d8dfe72 parents d607526 b855b5864 files · +1214 −368Browse files

Showing the changes to include/linux (2 of 64 files). Show all

Unified · Split

2 files
  1. include/linux/efi.h +3 −2
  2. include/linux/hardirq.h +7 −0
include/linux/efi.h+3−2
@@ -1613,6 +1613,7 @@ efi_status_t efi_setup_gop(efi_system_table_t *sys_table_arg, · 1612 unmodified lines
1613 1613
1614bool efi_runtime_disabled(void);1614bool efi_runtime_disabled(void);
1615extern void efi_call_virt_check_flags(unsigned long flags, const char *call);1615extern void efi_call_virt_check_flags(unsigned long flags, const char *call);
1616extern unsigned long efi_call_virt_save_flags(void);
1616 1617
1617enum efi_secureboot_mode {1618enum efi_secureboot_mode {
1618 efi_secureboot_mode_unset,1619 efi_secureboot_mode_unset,
@@ -1658,7 +1659,7 @@ void efi_retrieve_tpm2_eventlog(efi_system_table_t *sys_table); · 39 unmodified lines
1658 \1659 \
1659 arch_efi_call_virt_setup(); \1660 arch_efi_call_virt_setup(); \
1660 \1661 \
1661 local_save_flags(__flags); \1662 __flags = efi_call_virt_save_flags(); \
1662 __s = arch_efi_call_virt(p, f, args); \1663 __s = arch_efi_call_virt(p, f, args); \
1663 efi_call_virt_check_flags(__flags, __stringify(f)); \1664 efi_call_virt_check_flags(__flags, __stringify(f)); \
1664 \1665 \
@@ -1673,7 +1674,7 @@ void efi_retrieve_tpm2_eventlog(efi_system_table_t *sys_table); · 8 unmodified lines
1673 \1674 \
1674 arch_efi_call_virt_setup(); \1675 arch_efi_call_virt_setup(); \
1675 \1676 \
1676 local_save_flags(__flags); \1677 __flags = efi_call_virt_save_flags(); \
1677 arch_efi_call_virt(p, f, args); \1678 arch_efi_call_virt(p, f, args); \
1678 efi_call_virt_check_flags(__flags, __stringify(f)); \1679 efi_call_virt_check_flags(__flags, __stringify(f)); \
1679 \1680 \
include/linux/hardirq.h+7−0
@@ -60,8 +60,14 @@ extern void irq_enter(void); · 59 unmodified lines
60 */60 */
61extern void irq_exit(void);61extern void irq_exit(void);
62 62
63#ifndef arch_nmi_enter
64#define arch_nmi_enter() do { } while (0)
65#define arch_nmi_exit() do { } while (0)
66#endif
67
63#define nmi_enter() \68#define nmi_enter() \
64 do { \69 do { \
70 arch_nmi_enter(); \
65 printk_nmi_enter(); \71 printk_nmi_enter(); \
66 lockdep_off(); \72 lockdep_off(); \
67 ftrace_nmi_enter(); \73 ftrace_nmi_enter(); \
@@ -80,6 +86,7 @@ extern void irq_exit(void); · 12 unmodified lines
80 ftrace_nmi_exit(); \86 ftrace_nmi_exit(); \
81 lockdep_on(); \87 lockdep_on(); \
82 printk_nmi_exit(); \88 printk_nmi_exit(); \
89 arch_nmi_exit(); \
83 } while (0)90 } while (0)
84 91
85#endif /* LINUX_HARDIRQ_H */92#endif /* LINUX_HARDIRQ_H */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t