From f4d8069ddf3a60224256acbbe105a534b7349ffd Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Mon, 24 Sep 2012 15:21:00 -0400 Subject: [PATCH] PR14611: enable PR9740 workaround only for kernel 2.6.23 - 2.6.29ish --- runtime/transport/transport.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/runtime/transport/transport.c b/runtime/transport/transport.c index 439872942..25bd4da45 100644 --- a/runtime/transport/transport.c +++ b/runtime/transport/transport.c @@ -115,8 +115,11 @@ static void _stp_handle_start(struct _stp_msg_start *st) if (handle_startup) { dbug_trans(1, "stp_handle_start\n"); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23) // linux commit #5f4352fb +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) // linux commit #9be260a6 #ifdef STAPCONF_VM_AREA { /* PR9740: workaround for kernel valloc bug. */ + /* PR14611: not required except within above kernel range. */ void *dummy; #ifdef STAPCONF_VM_AREA_PTE dummy = alloc_vm_area (PAGE_SIZE, NULL); @@ -125,6 +128,8 @@ static void _stp_handle_start(struct _stp_msg_start *st) #endif free_vm_area (dummy); } +#endif +#endif #endif _stp_target = st->target; -- 2.43.5