diff options
| author | Helge Deller <deller@gmx.de> | 2019-03-18 22:56:15 +0100 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2019-04-06 19:07:55 +0200 |
| commit | c2f8d7cb32cd95e3005bed58ce02afa686b9f357 (patch) | |
| tree | b09653ebbcea70bfa28d02eff1a4c7772edbaa62 /drivers/parisc/iosapic.c | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| download | linux-c2f8d7cb32cd95e3005bed58ce02afa686b9f357.tar.xz linux-c2f8d7cb32cd95e3005bed58ce02afa686b9f357.zip | |
Revert: parisc: Use F_EXTEND() macro in iosapic code
Revert parts of commit 97d7e2e3fd8a ("parisc: Use F_EXTEND() macro in
iosapic code"). It breaks booting the 32-bit kernel on some machines.
Reported-by: Sven Schnelle <svens@stackframe.org>
Tested-by: Sven Schnelle <svens@stackframe.org>
Fixes: 97d7e2e3fd8a ("parisc: Use F_EXTEND() macro in iosapic code")
Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'drivers/parisc/iosapic.c')
| -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 |