/* * netsniff-ng - the packet sniffing beast * Copyright 2009, 2010, 2011, 2012 Daniel Borkmann. * Subject to the GPL, version 2. */ #define _GNU_SOURCE #include #include #include #include #include #include #include #include #include "xmalloc.h" #include "built_in.h" #include "die.h" #include "str.h" void *xmalloc(size_t size) { void *ptr; if (unlikely(size == 0)) panic("xmalloc: zero size\n"); ptr = malloc(size); if (unlikely(ptr == NULL)) panic("xmalloc: out of memory (allocating %zu bytes)\n", size); return ptr; } void *xzmalloc(size_t size) { void *ptr = xmalloc(size); memset(ptr, 0, size); return ptr; } void *xmalloc_aligned(size_t size, size_t alignment) { int ret; void *ptr; if (unlikely(size == 0)) panic("xmalloc_aligned: zero size\n"); ret = posix_memalign(&ptr, alignment, size); if (unlikely(ret != 0)) panic("xmalloc_aligned: out of memory (allocating %zu " "bytes)\n", size); return ptr; } void *xzmalloc_aligned(size_t size, size_t alignment) { void *ptr = xmalloc_aligned(size, alignment); memset(ptr, 0, size); return ptr; } void *xmallocz(size_t size) { void *ptr; if (unlikely(size + 1 < size)) panic("xmallocz: data too large to fit into virtual " "memory space\n"); ptr = xmalloc(size + 1); ((char*) ptr)[size] = 0; return ptr; } void *xmemdupz(const void *data, size_t len) { return memcpy(xmallocz(len), data, len); } void *xrealloc(void *ptr, size_t nmemb, size_t size) { void *new_ptr; size_t new_size = nmemb * size; if (unlikely(new_size == 0)) panic("xrealloc: zero size\n"); if (unlikely(((size_t) ~0) / nmemb < size)) panic("xrealloc: nmemb * size > SIZE_T_MAX\n"); if (ptr == NULL) new_ptr = malloc(new_size); else new_ptr = realloc(ptr, new_size); if (unlikely(new_ptr == NULL)) panic("xrealloc: out of memory (new_size %zu bytes)\n", new_size); return new_ptr; } void xfree_func(void *ptr) { if (unlikely(ptr == NULL)) panic("xfree: NULL pointer given as argument\n"); free(ptr); } char *xstrdup(const char *str) { size_t len; char *cp; len = strlen(str) + 1; cp = xmalloc(len); strlcpy(cp, str, len); return cp; } char *xstrndup(const char *str, size_t size) { size_t len; char *cp; len = strlen(str) + 1; if (size < len) len = size; cp = xmalloc(len); strlcpy(cp, str, len); return cp; } '867dfe342118b1ea0256a85f7c0d9ceb0ead032a'/>
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-10-25 17:52:04 +0200
committerDan Williams <dan.j.williams@intel.com>2016-10-27 16:16:21 -0700
commit867dfe342118b1ea0256a85f7c0d9ceb0ead032a (patch)
tree74645110b52086209be0a0f8f6ee8cc003e7174d /Documentation
parent3115bb02b5c23d960df5f1bf551ec394a9bb10ec (diff)
nvdimm: make CONFIG_NVDIMM_DAX 'bool'
A bugfix just tried to address a randconfig build problem and introduced a variant of the same problem: with CONFIG_LIBNVDIMM=y and CONFIG_NVDIMM_DAX=m, the nvdimm module now fails to link: drivers/nvdimm/built-in.o: In function `to_nd_device_type': bus.c:(.text+0x1b5d): undefined reference to `is_nd_dax' drivers/nvdimm/built-in.o: In function `nd_region_notify_driver_action.constprop.2': region_devs.c:(.text+0x6b6c): undefined reference to `is_nd_dax' region_devs.c:(.text+0x6b8c): undefined reference to `to_nd_dax' drivers/nvdimm/built-in.o: In function `nd_region_probe': region.c:(.text+0x70f3): undefined reference to `nd_dax_create' drivers/nvdimm/built-in.o: In function `mode_show': namespace_devs.c:(.text+0xa196): undefined reference to `is_nd_dax' drivers/nvdimm/built-in.o: In function `nvdimm_namespace_common_probe': (.text+0xa55f): undefined reference to `is_nd_dax' drivers/nvdimm/built-in.o: In function `nvdimm_namespace_common_probe': (.text+0xa56e): undefined reference to `to_nd_dax' This reverts the earlier fix, making NVDIMM_DAX a 'bool' option again as it should be (it gets linked into the libnvdimm module). To fix the original problem, I'm adding a dependency on LIBNVDIMM to DEV_DAX_PMEM, which ensures we can't have that one built-in if the rest is a module. Fixes: 4e65e9381c7a ("/dev/dax: fix Kconfig dependency build breakage") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'Documentation')