diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-08-31 17:07:38 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-08-31 17:07:38 -0600 |
| commit | e4f3869daedaf22dd224285cc7f0373e0a5025d2 (patch) | |
| tree | 3a3a95f7e6c6f65f83464a315290dc5a591d8269 | |
| parent | 7482b7ad0f60724e593a8919783444ef79f4c79e (diff) | |
| download | nuttx-e4f3869daedaf22dd224285cc7f0373e0a5025d2.tar.gz nuttx-e4f3869daedaf22dd224285cc7f0373e0a5025d2.tar.bz2 nuttx-e4f3869daedaf22dd224285cc7f0373e0a5025d2.zip | |
Update ChangeLog
| -rw-r--r-- | misc/drivers/rtl8187x/rtl8187x.c | 2 | ||||
| -rwxr-xr-x | nuttx/ChangeLog | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/misc/drivers/rtl8187x/rtl8187x.c b/misc/drivers/rtl8187x/rtl8187x.c index 5b43212d5..c7706a6c4 100644 --- a/misc/drivers/rtl8187x/rtl8187x.c +++ b/misc/drivers/rtl8187x/rtl8187x.c @@ -631,7 +631,7 @@ static inline FAR struct rtl8187x_state_s *rtl8187x_allocclass(void) FAR struct rtl8187x_state_s *priv; DEBUGASSERT(!up_interrupt_context()); - priv = (FAR struct rtl8187x_state_s *)kmalloc(sizeof(struct rtl8187x_state_s)); + priv = (FAR struct rtl8187x_state_s *)kmm_malloc(sizeof(struct rtl8187x_state_s)); uvdbg("Allocated: %p\n", priv);; return priv; } diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index a00683ca9..4a218ef6f 100755 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -8332,10 +8332,12 @@ * mm/*mm_brkaddr.c, *mm_extend.c, Makefile, and include/nuttx/mm.h: Add low-level memory management hooks that will be needed to support brk() and sbrk() (2014-8-31). - * Rename krealloc(0 to kmm_realloc() and kmemalign to kmm_memalign() for + * Rename krealloc() to kmm_realloc() and kmemalign to kmm_memalign() for consistency with the rest of the naming (2014-8-31). - * Rename kurealloc(0 to kumm_realloc(), kumemalign to kumm_memalign(), + * Rename kurealloc() to kumm_realloc(), kumemalign to kumm_memalign(), and kufree to kumm_free for consistency with the rest of the naming (2014-8-31). - * Rename kumalloc(0 to kumm_malloc() and kuzalloc to kumm_zalloc() for + * Rename kumalloc() to kumm_malloc() and kuzalloc to kumm_zalloc() for + consistency with the rest of the naming (2014-8-31). + * Rename kfree() to kmm_free() and kuzalloc to kumm_zalloc() for consistency with the rest of the naming (2014-8-31). |