From 6f7de8cd76bec1f90ec2dced6aaed583841dc954 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Sat, 24 Sep 2005 21:54:44 +0200 Subject: [PATCH] Revert "[PATCH] kernel: kill irq save/restore" This reverts 68bf440bf36d239ff3cb27b34b95ea7911c7c5a6 commit. --- ...ace-2.6.14-rc2-git-I1 => blk-trace-2.6.14-rc2-git-I0} | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) rename kernel/{blk-trace-2.6.14-rc2-git-I1 => blk-trace-2.6.14-rc2-git-I0} (98%) diff --git a/kernel/blk-trace-2.6.14-rc2-git-I1 b/kernel/blk-trace-2.6.14-rc2-git-I0 similarity index 98% rename from kernel/blk-trace-2.6.14-rc2-git-I1 rename to kernel/blk-trace-2.6.14-rc2-git-I0 index eea28af..c4402e3 100644 --- a/kernel/blk-trace-2.6.14-rc2-git-I1 +++ b/kernel/blk-trace-2.6.14-rc2-git-I0 @@ -273,8 +273,8 @@ diff --git a/mm/highmem.c b/mm/highmem.c * slow path */ --- /dev/null 2004-06-30 22:03:36.000000000 +0200 -+++ linux-2.6/drivers/block/blktrace.c 2005-09-23 17:22:55.000000000 +0200 -@@ -0,0 +1,227 @@ ++++ linux-2.6/drivers/block/blktrace.c 2005-09-23 17:17:32.000000000 +0200 +@@ -0,0 +1,230 @@ +#include +#include +#include @@ -290,6 +290,7 @@ diff --git a/mm/highmem.c b/mm/highmem.c + int rw, u32 what, int error, int pdu_len, void *pdu_data) +{ + struct blk_io_trace *t; ++ unsigned long flags; + int cpu; + + if (rw & (1 << BIO_RW_BARRIER)) @@ -324,9 +325,11 @@ diff --git a/mm/highmem.c b/mm/highmem.c + t->pid = current->pid; + memcpy(t->comm, current->comm, sizeof(t->comm)); + ++ local_irq_save(flags); + __relay_write(bt->rchan, t, sizeof(*t)); + if (pdu_len) + __relay_write(bt->rchan, pdu_data, pdu_len); ++ local_irq_restore(flags); + + put_cpu(); +} @@ -503,7 +506,7 @@ diff --git a/mm/highmem.c b/mm/highmem.c +module_init(blk_trace_init); + --- /dev/null 2004-06-30 22:03:36.000000000 +0200 -+++ linux-2.6/include/linux/blktrace.h 2005-09-23 17:20:00.000000000 +0200 ++++ linux-2.6/include/linux/blktrace.h 2005-09-23 17:17:02.000000000 +0200 @@ -0,0 +1,180 @@ +#ifndef BLKTRACE_H +#define BLKTRACE_H -- 2.25.1