> Reported-by: Frederic Weisbecker <fweisbec@gmail.com>
> Signed-off-by: Ingo Molnar <mingo@elte.hu>
> ---
> kernel/res_counter.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> Index: tip/kernel/res_counter.c
> ===================================================================
> --- tip.orig/kernel/res_counter.c
> +++ tip/kernel/res_counter.c
> @@ -14,6 +14,7 @@
> #include <linux/res_counter.h>
> #include <linux/uaccess.h>
> #include <linux/mm.h>
> +#include <linux/interrupt.h>
>
> void res_counter_init(struct res_counter *counter, struct res_counter *parent)
> {
> @@ -43,7 +44,7 @@ int res_counter_charge(struct res_counte
> struct res_counter *c, *u;
>
> *limit_fail_at = NULL;
> - local_irq_save(flags);
> + local_irq_save_nort(flags);
> for (c = counter; c != NULL; c = c->parent) {
> spin_lock(&c->lock);
> ret = res_counter_charge_locked(c, val);
> @@ -62,7 +63,7 @@ undo:
> spin_unlock(&u->lock);
> }
> done:
> - local_irq_restore(flags);
> + local_irq_restore_nort(flags);
> return ret;
> }
>
> @@ -79,13 +80,13 @@ void res_counter_uncharge(struct res_cou
> unsigned long flags;
> struct res_counter *c;
>
> - local_irq_save(flags);
> + local_irq_save_nort(flags);
> for (c = counter; c != NULL; c = c->parent) {
> spin_lock(&c->lock);
> res_counter_uncharge_locked(c, val);
> spin_unlock(&c->lock);
> }
> - local_irq_restore(flags);
> + local_irq_restore_nort(flags);
> }
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to
majordomo@vger.kernel.org
> More majordomo info at
http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at
http://www.tux.org/lkml/
>
