summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortrz <trz>2005-10-14 22:13:13 +0000
committertrz <trz>2005-10-14 22:13:13 +0000
commitaa82c03cab1c719059f5ebb4ee364cf408a19078 (patch)
tree0626c69577469f94f88d16644a7f1f9bf97b4dd2
parent08b40d88c111a077b1069babb6a51a2b68aef1a6 (diff)
downloadsystemtap-steved-aa82c03cab1c719059f5ebb4ee364cf408a19078.tar.gz
systemtap-steved-aa82c03cab1c719059f5ebb4ee364cf408a19078.tar.xz
systemtap-steved-aa82c03cab1c719059f5ebb4ee364cf408a19078.zip
Applied bugfix patch
-rw-r--r--runtime/relayfs/ChangeLog5
-rw-r--r--runtime/relayfs/buffers.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/runtime/relayfs/ChangeLog b/runtime/relayfs/ChangeLog
index 64c57fce..13fcdc42 100644
--- a/runtime/relayfs/ChangeLog
+++ b/runtime/relayfs/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-14 Tom Zanussi <zanussi@us.ibm.com>
+
+ * buffers.c (relay_alloc_buf): Applied patch
+ [PATCH 2.6.14-rc4] relayfs: fix bogus param value in call to vmap
+
2005-05-17 Martin Hunt <hunt@redhat.com>
* relay.c (relay_switch_subbuf): Applied patch
diff --git a/runtime/relayfs/buffers.c b/runtime/relayfs/buffers.c
index 6ec9db9e..0fa7ceae 100644
--- a/runtime/relayfs/buffers.c
+++ b/runtime/relayfs/buffers.c
@@ -109,7 +109,7 @@ static void *relay_alloc_buf(struct rchan_buf *buf, unsigned long size)
if (unlikely(!buf->page_array[i]))
goto depopulate;
}
- mem = vmap(buf->page_array, n_pages, GFP_KERNEL, PAGE_KERNEL);
+ mem = vmap(buf->page_array, n_pages, VM_MAP, PAGE_KERNEL);
if (!mem)
goto depopulate;