diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-06 10:59:30 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-06 10:59:30 -1000 |
| commit | 373c392508577b24e293ff4994e919087fed2495 (patch) | |
| tree | 95f9bb88cb2395bbef41f2c1454055bb3247dd3c /drivers | |
| parent | 10dce8af34226d90fa56746a934f8da5dcdba3df (diff) | |
| parent | d006e95b5561f708d0385e9677ffe2c46f2ae345 (diff) | |
| download | linux-stable-373c392508577b24e293ff4994e919087fed2495.tar.gz linux-stable-373c392508577b24e293ff4994e919087fed2495.tar.bz2 linux-stable-373c392508577b24e293ff4994e919087fed2495.zip | |
Merge branch 'parisc-5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fixes from Helge Deller:
"A 32-bit boot regression fix introduced in the merge window, a QEMU
detection fix and two fixes by Sven regarding ptrace & kprobes"
* 'parisc-5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Detect QEMU earlier in boot process
parisc: also set iaoq_b in instruction_pointer_set()
parisc: regs_return_value() should return gpr28
Revert: parisc: Use F_EXTEND() macro in iosapic code
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/parisc/iosapic.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c index 1be571c20062..6bad04cbb1d3 100644 --- a/drivers/parisc/iosapic.c +++ b/drivers/parisc/iosapic.c @@ -157,8 +157,12 @@ #define DBG_IRT(x...) #endif +#ifdef CONFIG_64BIT +#define COMPARE_IRTE_ADDR(irte, hpa) ((irte)->dest_iosapic_addr == (hpa)) +#else #define COMPARE_IRTE_ADDR(irte, hpa) \ - ((irte)->dest_iosapic_addr == F_EXTEND(hpa)) + ((irte)->dest_iosapic_addr == ((hpa) | 0xffffffff00000000ULL)) +#endif #define IOSAPIC_REG_SELECT 0x00 #define IOSAPIC_REG_WINDOW 0x10 |