diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-05-05 11:31:34 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-05-05 11:31:34 +0200 |
| commit | e63f9a85226b1520a5881da7e7fef82446deb879 (patch) | |
| tree | cdc1d521e9338d24af1c0a98c6177587a771b33e /common | |
| parent | 337bf5f7eb243fb909f045950e8b6f402e5a0f8e (diff) | |
| parent | b876c2b7394f9d5258e6b73f684741c88fa41f23 (diff) | |
| download | barebox-e63f9a85226b1520a5881da7e7fef82446deb879.tar.gz barebox-e63f9a85226b1520a5881da7e7fef82446deb879.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'common')
| -rw-r--r-- | common/dlmalloc.c | 3 | ||||
| -rw-r--r-- | common/dummy_malloc.c | 4 | ||||
| -rw-r--r-- | common/globalvar.c | 2 | ||||
| -rw-r--r-- | common/state/backend_bucket_circular.c | 1 |
4 files changed, 5 insertions, 5 deletions
diff --git a/common/dlmalloc.c b/common/dlmalloc.c index 499ec93c28..9c33cc2c95 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -1753,7 +1753,6 @@ void *calloc(size_t n, size_t elem_size) /* Utility to update current_mallinfo for malloc_stats and mallinfo() */ -#ifdef CONFIG_CMD_MEMINFO static void malloc_update_mallinfo(void) { int i; @@ -1821,8 +1820,6 @@ void malloc_stats(void) #endif } -#endif /* CONFIG_CMD_MEMINFO */ - /* History: diff --git a/common/dummy_malloc.c b/common/dummy_malloc.c index dd36a5b156..641baa125a 100644 --- a/common/dummy_malloc.c +++ b/common/dummy_malloc.c @@ -24,6 +24,10 @@ #include <common.h> #include <malloc.h> +void malloc_stats(void) +{ +} + void *memalign(size_t alignment, size_t bytes) { unsigned long mem = (unsigned long)sbrk(bytes + alignment); diff --git a/common/globalvar.c b/common/globalvar.c index 1ecf5134af..ff52c9d47f 100644 --- a/common/globalvar.c +++ b/common/globalvar.c @@ -19,7 +19,7 @@ struct device_d global_device = { .id = DEVICE_ID_SINGLE, }; -struct device_d nv_device = { +static struct device_d nv_device = { .name = "nv", .id = DEVICE_ID_SINGLE, }; diff --git a/common/state/backend_bucket_circular.c b/common/state/backend_bucket_circular.c index 832f44e599..7c81cdfaff 100644 --- a/common/state/backend_bucket_circular.c +++ b/common/state/backend_bucket_circular.c @@ -72,7 +72,6 @@ struct __attribute__((__packed__)) state_backend_storage_bucket_circular_meta { }; static const uint32_t circular_magic = 0x14fa2d02; -static const uint8_t free_pattern = 0xff; static inline struct state_backend_storage_bucket_circular *get_bucket_circular(struct state_backend_storage_bucket *bucket) |