The patch titled
CRIS: turn local_save_flags() + local_irq_disable() into local_irq_save() in headers
has been removed from the -mm tree. Its filename was
cris-turn-local_save_flags-local_irq_disable-into-local_irq_save-in-headers.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: CRIS: turn local_save_flags() + local_irq_disable() into local_irq_save() in headers
From: Jiri Kosina <jkosina@xxxxxxx>
Various headers for CRIS architecture contain local_irq_disable() after
local_save_flags(). Turn it into local_irq_save().
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
Cc: Mikael Starvik <starvik@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/asm-cris/semaphore-helper.h | 9 +++------
include/asm-cris/system.h | 3 +--
2 files changed, 4 insertions(+), 8 deletions(-)
diff -puN include/asm-cris/semaphore-helper.h~cris-turn-local_save_flags-local_irq_disable-into-local_irq_save-in-headers include/asm-cris/semaphore-helper.h
--- a/include/asm-cris/semaphore-helper.h~cris-turn-local_save_flags-local_irq_disable-into-local_irq_save-in-headers
+++ a/include/asm-cris/semaphore-helper.h
@@ -30,8 +30,7 @@ static inline int waking_non_zero(struct
unsigned long flags;
int ret = 0;
- local_save_flags(flags);
- local_irq_disable();
+ local_irq_save(flags);
if (read(&sem->waking) > 0) {
dec(&sem->waking);
ret = 1;
@@ -46,8 +45,7 @@ static inline int waking_non_zero_interr
int ret = 0;
unsigned long flags;
- local_save_flags(flags);
- local_irq_disable();
+ local_irq_save(flags);
if (read(&sem->waking) > 0) {
dec(&sem->waking);
ret = 1;
@@ -64,8 +62,7 @@ static inline int waking_non_zero_tryloc
int ret = 1;
unsigned long flags;
- local_save_flags(flags);
- local_irq_disable();
+ local_irq_save(flags);
if (read(&sem->waking) <= 0)
inc(&sem->count);
else {
diff -puN include/asm-cris/system.h~cris-turn-local_save_flags-local_irq_disable-into-local_irq_save-in-headers include/asm-cris/system.h
--- a/include/asm-cris/system.h~cris-turn-local_save_flags-local_irq_disable-into-local_irq_save-in-headers
+++ a/include/asm-cris/system.h
@@ -44,8 +44,7 @@ static inline unsigned long __xchg(unsig
/* since Etrax doesn't have any atomic xchg instructions, we need to disable
irq's (if enabled) and do it with move.d's */
unsigned long flags,temp;
- local_save_flags(flags); /* save flags, including irq enable bit */
- local_irq_disable(); /* shut off irq's */
+ local_irq_save(flags); /* save flags, including irq enable bit and shut off irqs */
switch (size) {
case 1:
*((unsigned char *)&temp) = x;
_
Patches currently in -mm which might be from jkosina@xxxxxxx are
origin.patch
git-alsa.patch
git-hid.patch
git-ipwireless_cs.patch
ds1302-local_irq_disable-is-redundant-after-local_irq_save.patch
sysctl-mac_hid-remove-unnecessary-insert_at_head-flag.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
