Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (27 commits)
rtmutex: Add missing rcu_read_unlock() in debug_rt_mutex_print_deadlock()
lockdep: Comment all warnings
lib: atomic64: Change the type of local lock to raw_spinlock_t
locking, lib/atomic64: Annotate atomic64_lock::lock as raw
locking, x86, iommu: Annotate qi->q_lock as raw
locking, x86, iommu: Annotate irq_2_ir_lock as raw
locking, x86, iommu: Annotate iommu->register_lock as raw
locking, dma, ipu: Annotate bank_lock as raw
locking, ARM: Annotate low level hw locks as raw
locking, drivers/dca: Annotate dca_lock as raw
locking, powerpc: Annotate uic->lock as raw
locking, x86: mce: Annotate cmci_discover_lock as raw
locking, ACPI: Annotate c3_lock as raw
locking, oprofile: Annotate oprofilefs lock as raw
locking, video: Annotate vga console lock as raw
locking, latencytop: Annotate latency_lock as raw
locking, timer_stats: Annotate table_lock as raw
locking, rwsem: Annotate inner lock as raw
locking, semaphores: Annotate inner lock as raw
locking, sched: Annotate thread_group_cputimer as raw
...
Fix up conflicts in kernel/posix-cpu-timers.c manually: making
cputimer->cputime a raw lock conflicted with the ABBA fix in commit
bcd5cff721
("cputimer: Cure lock inversion").
This commit is contained in:
@@ -209,7 +209,7 @@ static struct amba_pl010_data integrator_uart_data = {
|
||||
|
||||
#define CM_CTRL IO_ADDRESS(INTEGRATOR_HDR_CTRL)
|
||||
|
||||
static DEFINE_SPINLOCK(cm_lock);
|
||||
static DEFINE_RAW_SPINLOCK(cm_lock);
|
||||
|
||||
/**
|
||||
* cm_control - update the CM_CTRL register.
|
||||
@@ -221,10 +221,10 @@ void cm_control(u32 mask, u32 set)
|
||||
unsigned long flags;
|
||||
u32 val;
|
||||
|
||||
spin_lock_irqsave(&cm_lock, flags);
|
||||
raw_spin_lock_irqsave(&cm_lock, flags);
|
||||
val = readl(CM_CTRL) & ~mask;
|
||||
writel(val | set, CM_CTRL);
|
||||
spin_unlock_irqrestore(&cm_lock, flags);
|
||||
raw_spin_unlock_irqrestore(&cm_lock, flags);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(cm_control);
|
||||
|
@@ -163,7 +163,7 @@
|
||||
* 7:2 register number
|
||||
*
|
||||
*/
|
||||
static DEFINE_SPINLOCK(v3_lock);
|
||||
static DEFINE_RAW_SPINLOCK(v3_lock);
|
||||
|
||||
#define PCI_BUS_NONMEM_START 0x00000000
|
||||
#define PCI_BUS_NONMEM_SIZE SZ_256M
|
||||
@@ -284,7 +284,7 @@ static int v3_read_config(struct pci_bus *bus, unsigned int devfn, int where,
|
||||
unsigned long flags;
|
||||
u32 v;
|
||||
|
||||
spin_lock_irqsave(&v3_lock, flags);
|
||||
raw_spin_lock_irqsave(&v3_lock, flags);
|
||||
addr = v3_open_config_window(bus, devfn, where);
|
||||
|
||||
switch (size) {
|
||||
@@ -302,7 +302,7 @@ static int v3_read_config(struct pci_bus *bus, unsigned int devfn, int where,
|
||||
}
|
||||
|
||||
v3_close_config_window();
|
||||
spin_unlock_irqrestore(&v3_lock, flags);
|
||||
raw_spin_unlock_irqrestore(&v3_lock, flags);
|
||||
|
||||
*val = v;
|
||||
return PCIBIOS_SUCCESSFUL;
|
||||
@@ -314,7 +314,7 @@ static int v3_write_config(struct pci_bus *bus, unsigned int devfn, int where,
|
||||
unsigned long addr;
|
||||
unsigned long flags;
|
||||
|
||||
spin_lock_irqsave(&v3_lock, flags);
|
||||
raw_spin_lock_irqsave(&v3_lock, flags);
|
||||
addr = v3_open_config_window(bus, devfn, where);
|
||||
|
||||
switch (size) {
|
||||
@@ -335,7 +335,7 @@ static int v3_write_config(struct pci_bus *bus, unsigned int devfn, int where,
|
||||
}
|
||||
|
||||
v3_close_config_window();
|
||||
spin_unlock_irqrestore(&v3_lock, flags);
|
||||
raw_spin_unlock_irqrestore(&v3_lock, flags);
|
||||
|
||||
return PCIBIOS_SUCCESSFUL;
|
||||
}
|
||||
@@ -513,7 +513,7 @@ void __init pci_v3_preinit(void)
|
||||
hook_fault_code(8, v3_pci_fault, SIGBUS, 0, "external abort on non-linefetch");
|
||||
hook_fault_code(10, v3_pci_fault, SIGBUS, 0, "external abort on non-linefetch");
|
||||
|
||||
spin_lock_irqsave(&v3_lock, flags);
|
||||
raw_spin_lock_irqsave(&v3_lock, flags);
|
||||
|
||||
/*
|
||||
* Unlock V3 registers, but only if they were previously locked.
|
||||
@@ -586,7 +586,7 @@ void __init pci_v3_preinit(void)
|
||||
printk(KERN_ERR "PCI: unable to grab PCI error "
|
||||
"interrupt: %d\n", ret);
|
||||
|
||||
spin_unlock_irqrestore(&v3_lock, flags);
|
||||
raw_spin_unlock_irqrestore(&v3_lock, flags);
|
||||
}
|
||||
|
||||
void __init pci_v3_postinit(void)
|
||||
|
Reference in New Issue
Block a user