Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branches 'irq-urgent-for-linus' and 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq/timer fixes from Thomas Gleixner:
"irq: a fix for the new hierarchical MSI interrupt handling which
unbreaks PCI=n configurations.
timers: a fix for the new hrtimer clock offset update mechanism to
ensure that the boot time offset is respected"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
genirq/msi: Do not use pci_msi_[un]mask_irq as default methods
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
timekeeping: Increment clock_was_set_seq in timekeeping_init()
+6
-6
+4
drivers/pci/msi.c
+4
drivers/pci/msi.c
···
1243
1243
BUG_ON(!chip);
1244
1244
if (!chip->irq_write_msi_msg)
1245
1245
chip->irq_write_msi_msg = pci_msi_domain_write_msg;
1246
+
if (!chip->irq_mask)
1247
+
chip->irq_mask = pci_msi_mask_irq;
1248
+
if (!chip->irq_unmask)
1249
+
chip->irq_unmask = pci_msi_unmask_irq;
1246
1250
}
1247
1251
1248
1252
/**
+1
-5
kernel/irq/msi.c
+1
-5
kernel/irq/msi.c
···
228
228
{
229
229
struct irq_chip *chip = info->chip;
230
230
231
-
BUG_ON(!chip);
232
-
if (!chip->irq_mask)
233
-
chip->irq_mask = pci_msi_mask_irq;
234
-
if (!chip->irq_unmask)
235
-
chip->irq_unmask = pci_msi_unmask_irq;
231
+
BUG_ON(!chip || !chip->irq_mask || !chip->irq_unmask);
236
232
if (!chip->irq_set_affinity)
237
233
chip->irq_set_affinity = msi_domain_set_affinity;
238
234
}
+1
-1
kernel/time/timekeeping.c
+1
-1
kernel/time/timekeeping.c
···
1251
1251
set_normalized_timespec64(&tmp, -boot.tv_sec, -boot.tv_nsec);
1252
1252
tk_set_wall_to_mono(tk, tmp);
1253
1253
1254
-
timekeeping_update(tk, TK_MIRROR);
1254
+
timekeeping_update(tk, TK_MIRROR | TK_CLOCK_WAS_SET);
1255
1255
1256
1256
write_seqcount_end(&tk_core.seq);
1257
1257
raw_spin_unlock_irqrestore(&timekeeper_lock, flags);