From c8255c5a4f93740f26a760728ad4aa4f41261ba3 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 24 Mar 2006 11:14:37 +0100 Subject: [PATCH] [PATCH] Update references to kernel patch and its inclusion in mainline --- README | 8 +++++--- doc/blktrace.tex | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README b/README index 37e6b65..879d0de 100644 --- a/README +++ b/README @@ -11,8 +11,10 @@ patches. Requirements ------------ -You need to be running a 2.6.14-rc3 kernel or newer, with the blk-trace patch -included in this repository. If you forgot where you got it, the url is: +blktrace was integrated into the mainline kernel between 2.6.16 and 2.6.17-rc1. +The target trace needs to run on a kernel at least that new. The blktrace +repository contains a kernel patch against 2.6.16 and will continue to do +so until 2.6.17 is released. If you forgot where you got it, the url is: rsync://rsync.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git @@ -179,5 +181,5 @@ the mail body. -20051007, Jens Axboe +2006-03-24, Jens Axboe diff --git a/doc/blktrace.tex b/doc/blktrace.tex index 3149335..4c1c844 100644 --- a/doc/blktrace.tex +++ b/doc/blktrace.tex @@ -35,7 +35,8 @@ three major components that are provided: \begin{description} \item[Kernel patch] A patch to the Linux kernel which includes the kernel event logging interfaces, and patches to areas within the block - layer to emit event traces. + layer to emit event traces. If you run a 2.6.17-rc1 or newer kernel, + you don't need to patch blktrace support as it is already included. \item[blktrace] A utility which transfers event traces from the kernel into either long-term on-disk storage, or provides direct formatted @@ -75,6 +76,7 @@ A patch for a \emph{specific Linux kernel} is provided in bt/kernel (where \emph{bt} is the name of the directory from the above git sequence). The detailed actual patching instructions for a Linux kernel is outside the scope of this document, but the following may be used as a sample template. +Note that you may skip this step, if you kernel is at least 2.6.17-rc1. As an example, bt/kernel contains blk-trace-2.6.14-rc1-git-G2, download linux-2.6.13.tar.bz2 and patch-2.6.14-rc1.bz2 -- 2.25.1