diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-01-18 15:26:28 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-01-18 15:26:28 +0800 |
| commit | 2ba51c6d36ee1b43c1f898c6c48ddf3d33e9ab30 (patch) | |
| tree | ff3302dc45a91d7bfcaabd37bfa8fa391a954180 /arch/x86/include/asm/hw_irq.h | |
| parent | 28610abf4a574c33ca70e3d7b0e523fdede488d1 (diff) | |
| parent | 90816cc1d4a1d23efe37b74866c6174dd5eab6b5 (diff) | |
Merge remote-tracking branch 'rt-stable/v4.9-rt' into linux-linaro-lsk-v4.9-rtlsk-v4.9-18.02-rt
Conflicts:
arch/arm64/mm/init.c
Diffstat (limited to 'arch/x86/include/asm/hw_irq.h')
| -rw-r--r-- | arch/x86/include/asm/hw_irq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h index b90e1053049b..0817d63bce41 100644 --- a/arch/x86/include/asm/hw_irq.h +++ b/arch/x86/include/asm/hw_irq.h @@ -178,7 +178,7 @@ extern char irq_entries_start[]; #define VECTOR_RETRIGGERED ((void *)~0UL) typedef struct irq_desc* vector_irq_t[NR_VECTORS]; -DECLARE_PER_CPU(vector_irq_t, vector_irq); +DECLARE_PER_CPU_USER_MAPPED(vector_irq_t, vector_irq); #endif /* !ASSEMBLY_ */ |