The patch titled
SPIN_LOCK_UNLOCKED cleanup in arch/m68k
has been removed from the -mm tree. Its filename was
spin_lock_unlocked-cleanup-in-arch-m68k.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: SPIN_LOCK_UNLOCKED cleanup in arch/m68k
From: Milind Arun Choudhary <milindchoudhary@xxxxxxxxx>
SPIN_LOCK_UNLOCKED cleanup,use __SPIN_LOCK_UNLOCKED instead
Signed-off-by: Milind Arun Choudhary <milindchoudhary@xxxxxxxxx>
Cc: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/m68k/amiga/amiints.c | 2 +-
arch/m68k/amiga/cia.c | 4 ++--
arch/m68k/apollo/dn_ints.c | 2 +-
arch/m68k/atari/ataints.c | 2 +-
arch/m68k/kernel/ints.c | 4 ++--
arch/m68k/mac/macints.c | 2 +-
arch/m68k/q40/q40ints.c | 2 +-
arch/m68k/sun3/sun3ints.c | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff -puN arch/m68k/amiga/amiints.c~spin_lock_unlocked-cleanup-in-arch-m68k arch/m68k/amiga/amiints.c
--- a/arch/m68k/amiga/amiints.c~spin_lock_unlocked-cleanup-in-arch-m68k
+++ a/arch/m68k/amiga/amiints.c
@@ -54,7 +54,7 @@ static irqreturn_t ami_int5(int irq, voi
static struct irq_controller amiga_irq_controller = {
.name = "amiga",
- .lock = SPIN_LOCK_UNLOCKED,
+ .lock = __SPIN_LOCK_UNLOCKED(amiga_irq_controller.lock),
.enable = amiga_enable_irq,
.disable = amiga_disable_irq,
};
diff -puN arch/m68k/amiga/cia.c~spin_lock_unlocked-cleanup-in-arch-m68k arch/m68k/amiga/cia.c
--- a/arch/m68k/amiga/cia.c~spin_lock_unlocked-cleanup-in-arch-m68k
+++ a/arch/m68k/amiga/cia.c
@@ -123,7 +123,7 @@ static void cia_disable_irq(unsigned int
static struct irq_controller cia_irq_controller = {
.name = "cia",
- .lock = SPIN_LOCK_UNLOCKED,
+ .lock = __SPIN_LOCK_UNLOCKED(cia_irq_controller.lock),
.enable = cia_enable_irq,
.disable = cia_disable_irq,
};
@@ -160,7 +160,7 @@ static void auto_disable_irq(unsigned in
static struct irq_controller auto_irq_controller = {
.name = "auto",
- .lock = SPIN_LOCK_UNLOCKED,
+ .lock = __SPIN_LOCK_UNLOCKED(auto_irq_controller.lock),
.enable = auto_enable_irq,
.disable = auto_disable_irq,
};
diff -puN arch/m68k/apollo/dn_ints.c~spin_lock_unlocked-cleanup-in-arch-m68k arch/m68k/apollo/dn_ints.c
--- a/arch/m68k/apollo/dn_ints.c~spin_lock_unlocked-cleanup-in-arch-m68k
+++ a/arch/m68k/apollo/dn_ints.c
@@ -31,7 +31,7 @@ void apollo_irq_shutdown(unsigned int ir
static struct irq_controller apollo_irq_controller = {
.name = "apollo",
- .lock = SPIN_LOCK_UNLOCKED,
+ .lock = __SPIN_LOCK_UNLOCKED(apollo_irq_controller.lock),
.startup = apollo_irq_startup,
.shutdown = apollo_irq_shutdown,
};
diff -puN arch/m68k/atari/ataints.c~spin_lock_unlocked-cleanup-in-arch-m68k arch/m68k/atari/ataints.c
--- a/arch/m68k/atari/ataints.c~spin_lock_unlocked-cleanup-in-arch-m68k
+++ a/arch/m68k/atari/ataints.c
@@ -339,7 +339,7 @@ static void atari_shutdown_irq(unsigned
static struct irq_controller atari_irq_controller = {
.name = "atari",
- .lock = SPIN_LOCK_UNLOCKED,
+ .lock = __SPIN_LOCK_UNLOCKED(atari_irq_controller.lock),
.startup = atari_startup_irq,
.shutdown = atari_shutdown_irq,
.enable = atari_enable_irq,
diff -puN arch/m68k/kernel/ints.c~spin_lock_unlocked-cleanup-in-arch-m68k arch/m68k/kernel/ints.c
--- a/arch/m68k/kernel/ints.c~spin_lock_unlocked-cleanup-in-arch-m68k
+++ a/arch/m68k/kernel/ints.c
@@ -59,14 +59,14 @@ static int m68k_first_user_vec;
static struct irq_controller auto_irq_controller = {
.name = "auto",
- .lock = SPIN_LOCK_UNLOCKED,
+ .lock = __SPIN_LOCK_UNLOCKED(auto_irq_controller.lock),
.startup = m68k_irq_startup,
.shutdown = m68k_irq_shutdown,
};
static struct irq_controller user_irq_controller = {
.name = "user",
- .lock = SPIN_LOCK_UNLOCKED,
+ .lock = __SPIN_LOCK_UNLOCKED(user_irq_controller.lock),
.startup = m68k_irq_startup,
.shutdown = m68k_irq_shutdown,
};
diff -puN arch/m68k/mac/macints.c~spin_lock_unlocked-cleanup-in-arch-m68k arch/m68k/mac/macints.c
--- a/arch/m68k/mac/macints.c~spin_lock_unlocked-cleanup-in-arch-m68k
+++ a/arch/m68k/mac/macints.c
@@ -219,7 +219,7 @@ static void mac_disable_irq(unsigned int
static struct irq_controller mac_irq_controller = {
.name = "mac",
- .lock = SPIN_LOCK_UNLOCKED,
+ .lock = __SPIN_LOCK_UNLOCKED(mac_irq_controller.lock),
.enable = mac_enable_irq,
.disable = mac_disable_irq,
};
diff -puN arch/m68k/q40/q40ints.c~spin_lock_unlocked-cleanup-in-arch-m68k arch/m68k/q40/q40ints.c
--- a/arch/m68k/q40/q40ints.c~spin_lock_unlocked-cleanup-in-arch-m68k
+++ a/arch/m68k/q40/q40ints.c
@@ -59,7 +59,7 @@ static void q40_irq_shutdown(unsigned in
static struct irq_controller q40_irq_controller = {
.name = "q40",
- .lock = SPIN_LOCK_UNLOCKED,
+ .lock = __SPIN_LOCK_UNLOCKED(q40_irq_controller.lock),
.startup = q40_irq_startup,
.shutdown = q40_irq_shutdown,
.enable = q40_enable_irq,
diff -puN arch/m68k/sun3/sun3ints.c~spin_lock_unlocked-cleanup-in-arch-m68k arch/m68k/sun3/sun3ints.c
--- a/arch/m68k/sun3/sun3ints.c~spin_lock_unlocked-cleanup-in-arch-m68k
+++ a/arch/m68k/sun3/sun3ints.c
@@ -90,7 +90,7 @@ static void sun3_inthandle(unsigned int
static struct irq_controller sun3_irq_controller = {
.name = "sun3",
- .lock = SPIN_LOCK_UNLOCKED,
+ .lock = __SPIN_LOCK_UNLOCKED(sun3_irq_controller.lock),
.startup = m68k_irq_startup,
.shutdown = m68k_irq_shutdown,
.enable = sun3_enable_irq,
_
Patches currently in -mm which might be from milindchoudhary@xxxxxxxxx are
origin.patch
git-alsa.patch
spin_lock_unlocked-macro-cleanup-in-arch-ia64.patch
git-jfs.patch
nfs-use-__set_current_state.patch
round_up-macro-cleanup-in-drivers-parisc.patch
round_up-macro-cleanup-in-drivers-pci.patch
pcie-remove-spin_lock_unlocked.patch
round_up-macro-cleanup-in-arch-sh64-kernel-pci_sh5c.patch
round_up-macro-cleanup-in-drivers-char-lpc.patch
round_up-macro-cleanup-in-fs-selectcompatreaddirc.patch
round_up-macro-cleanup-in-fs-smbfs-requestc.patch
spin_lock_unlocked-cleanup-in-init_taskh.patch
spin_lock_unlocked-cleanup-in-drivers-char-keyboard.patch
spin_lock_unlocked-cleanup-in-drivers-serial.patch
reiserfs-use-__set_current_state.patch
drivers-char-use-__set_current_state.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
