Revert parts of commit 97d7e2e3fd8a ("parisc: Use F_EXTEND() macro in iosapic code"). It breaks booting the 32-bit kernel on some machines.
Unified · Split
| @@ -157,8 +157,12 @@ · 156 unmodified lines | ||
| 157 | 157 | #define DBG_IRT(x...) |
| 158 | 158 | #endif |
| 159 | 159 | |
| 160 | +#ifdef CONFIG_64BIT | |
| 161 | +#define COMPARE_IRTE_ADDR(irte, hpa) ((irte)->dest_iosapic_addr == (hpa)) | |
| 162 | +#else | |
| 160 | 163 | #define COMPARE_IRTE_ADDR(irte, hpa) \ |
| 161 | − ((irte)->dest_iosapic_addr == F_EXTEND(hpa)) | |
| 164 | + ((irte)->dest_iosapic_addr == ((hpa) | 0xffffffff00000000ULL)) | |
| 165 | +#endif | |
| 162 | 166 | |
| 163 | 167 | #define IOSAPIC_REG_SELECT 0x00 |
| 164 | 168 | #define IOSAPIC_REG_WINDOW 0x10 |