Commit 4a8a738d authored by Ralf Baechle's avatar Ralf Baechle

MIPS: Make various locks static.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 559e25a5
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
DEFINE_RWLOCK(octeon_irq_ciu0_rwlock); DEFINE_RWLOCK(octeon_irq_ciu0_rwlock);
DEFINE_RWLOCK(octeon_irq_ciu1_rwlock); DEFINE_RWLOCK(octeon_irq_ciu1_rwlock);
DEFINE_SPINLOCK(octeon_irq_msi_lock);
static int octeon_coreid_for_cpu(int cpu) static int octeon_coreid_for_cpu(int cpu)
{ {
...@@ -545,6 +544,8 @@ static struct irq_chip octeon_irq_chip_ciu1 = { ...@@ -545,6 +544,8 @@ static struct irq_chip octeon_irq_chip_ciu1 = {
#ifdef CONFIG_PCI_MSI #ifdef CONFIG_PCI_MSI
static DEFINE_SPINLOCK(octeon_irq_msi_lock);
static void octeon_irq_msi_ack(unsigned int irq) static void octeon_irq_msi_ack(unsigned int irq)
{ {
if (!octeon_has_feature(OCTEON_FEATURE_PCIE)) { if (!octeon_has_feature(OCTEON_FEATURE_PCIE)) {
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
* There is no default value -- it has to be initialized. * There is no default value -- it has to be initialized.
*/ */
u16 cached_kn01_csr; u16 cached_kn01_csr;
DEFINE_SPINLOCK(kn01_lock); static DEFINE_SPINLOCK(kn01_lock);
static inline void dec_kn01_be_ack(void) static inline void dec_kn01_be_ack(void)
......
...@@ -80,7 +80,6 @@ ...@@ -80,7 +80,6 @@
struct pt_regs; struct pt_regs;
extern u16 cached_kn01_csr; extern u16 cached_kn01_csr;
extern spinlock_t kn01_lock;
extern void dec_kn01_be_init(void); extern void dec_kn01_be_init(void);
extern int dec_kn01_be_handler(struct pt_regs *regs, int is_fixup); extern int dec_kn01_be_handler(struct pt_regs *regs, int is_fixup);
......
...@@ -47,7 +47,7 @@ static struct loongson2_register_config { ...@@ -47,7 +47,7 @@ static struct loongson2_register_config {
int cnt1_enabled, cnt2_enabled; int cnt1_enabled, cnt2_enabled;
} reg; } reg;
DEFINE_SPINLOCK(sample_lock); static DEFINE_SPINLOCK(sample_lock);
static char *oprofid = "LoongsonPerf"; static char *oprofid = "LoongsonPerf";
static irqreturn_t loongson2_perfcount_handler(int irq, void *dev_id); static irqreturn_t loongson2_perfcount_handler(int irq, void *dev_id);
......
...@@ -206,7 +206,7 @@ static void pci_proc_init(void) ...@@ -206,7 +206,7 @@ static void pci_proc_init(void)
} }
#endif /* CONFIG_PROC_FS && PCI_COUNTERS */ #endif /* CONFIG_PROC_FS && PCI_COUNTERS */
DEFINE_SPINLOCK(bpci_lock); static DEFINE_SPINLOCK(bpci_lock);
/***************************************************************************** /*****************************************************************************
* *
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
typedef unsigned long machreg_t; typedef unsigned long machreg_t;
DEFINE_SPINLOCK(nmi_lock); static DEFINE_SPINLOCK(nmi_lock);
/* /*
* Lets see what else we need to do here. Set up sp, gp? * Lets see what else we need to do here. Set up sp, gp?
......
...@@ -73,7 +73,7 @@ static struct irq_chip bcm1480_irq_type = { ...@@ -73,7 +73,7 @@ static struct irq_chip bcm1480_irq_type = {
/* Store the CPU id (not the logical number) */ /* Store the CPU id (not the logical number) */
int bcm1480_irq_owner[BCM1480_NR_IRQS]; int bcm1480_irq_owner[BCM1480_NR_IRQS];
DEFINE_SPINLOCK(bcm1480_imr_lock); static DEFINE_SPINLOCK(bcm1480_imr_lock);
void bcm1480_mask_irq(int cpu, int irq) void bcm1480_mask_irq(int cpu, int irq)
{ {
......
...@@ -72,7 +72,7 @@ static struct irq_chip sb1250_irq_type = { ...@@ -72,7 +72,7 @@ static struct irq_chip sb1250_irq_type = {
/* Store the CPU id (not the logical number) */ /* Store the CPU id (not the logical number) */
int sb1250_irq_owner[SB1250_NR_IRQS]; int sb1250_irq_owner[SB1250_NR_IRQS];
DEFINE_SPINLOCK(sb1250_imr_lock); static DEFINE_SPINLOCK(sb1250_imr_lock);
void sb1250_mask_irq(int cpu, int irq) void sb1250_mask_irq(int cpu, int irq)
{ {
......
...@@ -132,7 +132,7 @@ device_initcall(snirm_setup_devinit); ...@@ -132,7 +132,7 @@ device_initcall(snirm_setup_devinit);
* readb/writeb to access them * readb/writeb to access them
*/ */
DEFINE_SPINLOCK(sni_rm200_i8259A_lock); static DEFINE_SPINLOCK(sni_rm200_i8259A_lock);
#define PIC_CMD 0x00 #define PIC_CMD 0x00
#define PIC_IMR 0x01 #define PIC_IMR 0x01
#define PIC_ISR PIC_CMD #define PIC_ISR PIC_CMD
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment