Fix: build failure on 2.6.36
A message that is not in the archive (sent off-list or not yet received): [email protected]
Mathieu Desnoyers
AppliedMerged into master, stable-2.7, stable-2.6, stable-2.5, thanks!
Mathieu
Quoted 95 lines · ----- On Aug 31, 2015, at 9:57 AM, Michael Jeanson [email protected] wrote:
Fixes build failure on the 2.6.36 kernel branch which misses the
vzalloc()function.Signed-off-by Michael Jeanson <[email protected]>---
lttng-events.c| 5 +++--wrapper/vzalloc.h| 47 +++++++++++++++++++++++++++++++++++++++++++++++2 files changed, 50 insertions(+), 2 deletions(-)create mode 100644
wrapper/vzalloc.hlttng-events.c +3
-2@@ -50,6 +50,7 @@#include "lttng-events.h" #include "lttng-tracer.h" #include "lttng-abi-old.h" +#include "wrapper/vzalloc.h" #define METADATA_CACHE_DEFAULT_SIZE 4096@@ -133,7 +134,7 @@ struct lttng_session *lttng_session_create(void) GFP_KERNEL);if (!metadata_cache) goto err_free_session; - metadata_cache->data =vzalloc (METADATA_CACHE_DEFAULT_SIZE ); + metadata_cache->data =lttng_vzalloc (METADATA_CACHE_DEFAULT_SIZE );if (!metadata_cache->data) goto err_free_cache; metadata_cache->cache_alloc =METADATA_CACHE_DEFAULT_SIZE ;@@ -1531,7 +1532,7 @@ int lttng_metadata_printf(struct lttng_session *session, tmp_cache_alloc_size = max_t(unsigned int, session->metadata_cache->cache_alloc + len, session->metadata_cache->cache_alloc <<1 ); - tmp_cache_realloc =vzalloc (tmp_cache_alloc_size); + tmp_cache_realloc =lttng_vzalloc (tmp_cache_alloc_size);if (!tmp_cache_realloc) goto err;if (session->metadata_cache->data) {wrapper/vzalloc.h new file +47
-1@@ -0,0 +1,47 @@ +#ifndef _LTTNG_WRAPPER_VZALLOC_H +#define _LTTNG_WRAPPER_VZALLOC_H + +/* +* wrapper/vzalloc.h +* +* Copyright (C) 2015 Michael Jeanson <[email protected]> +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; only +* version 2.1 of the License. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#include <linux/version.h> +#include <linux/vmalloc.h> + +#if LTTNG_KERNEL_RANGE (2 ,6 ,36 ,2 ,6 ,37 ) +static inline +void *lttng_vzalloc (unsigned long size) +{ +void *ret; + ret =vmalloc (size); +if (!ret) +return NULL ; +memset (ret,0 , size); +return ret; +} +#else +static inline +void *lttng_vzalloc (unsigned long size) +{ +return vzalloc (size); +} +#endif + + +#endif /* _LTTNG_WRAPPER_VZALLOC_H */ --1.9.1
Signature · 3 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com