Changeset 6d5da743 in mainline for kernel/generic
- Timestamp:
- 2014-04-25T08:10:14Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- d815b74, fef725d
- Parents:
- 7cd15b9 (diff), 723ce99 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)links above to see all the changes relative to each parent. - Location:
- kernel/generic
- Files:
-
- 8 edited
-
include/cc.h (modified) (1 diff)
-
include/debug.h (modified) (1 diff)
-
include/lib/memfnc.h (modified) (1 diff)
-
include/memstr.h (modified) (2 diffs)
-
src/console/cmd.c (modified) (1 diff)
-
src/mm/as.c (modified) (2 diffs)
-
src/mm/frame.c (modified) (1 diff)
-
src/udebug/udebug_ipc.c (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
kernel/generic/include/cc.h
r7cd15b9 r6d5da743 40 40 #define ATTRIBUTE_OPTIMIZE(opt) \ 41 41 __attribute__ ((optimize(opt))) 42 #define ATTRIBUTE_USED \ 43 __attribute__ ((used)) 42 44 #else 43 45 #define ATTRIBUTE_OPTIMIZE(opt) 46 #define ATTRIBUTE_USED 44 47 #endif 45 48 -
kernel/generic/include/debug.h
r7cd15b9 r6d5da743 37 37 38 38 #include <panic.h> 39 #include <log.h> 39 40 #include <symtab_lookup.h> 40 41 -
kernel/generic/include/lib/memfnc.h
r7cd15b9 r6d5da743 39 39 #include <cc.h> 40 40 41 #ifdef CONFIG_LTO 42 #define DO_NOT_DISCARD ATTRIBUTE_USED 43 #else 44 #define DO_NOT_DISCARD 45 #endif 46 41 47 extern void *memset(void *, int, size_t) 42 ATTRIBUTE_OPTIMIZE("-fno-tree-loop-distribute-patterns") ;48 ATTRIBUTE_OPTIMIZE("-fno-tree-loop-distribute-patterns") DO_NOT_DISCARD; 43 49 extern void *memcpy(void *, const void *, size_t) 44 ATTRIBUTE_OPTIMIZE("-fno-tree-loop-distribute-patterns") ;50 ATTRIBUTE_OPTIMIZE("-fno-tree-loop-distribute-patterns") DO_NOT_DISCARD; 45 51 46 52 #endif -
kernel/generic/include/memstr.h
r7cd15b9 r6d5da743 37 37 38 38 #include <typedefs.h> 39 #include <cc.h> 40 41 #ifdef CONFIG_LTO 42 #define DO_NOT_DISCARD ATTRIBUTE_USED 43 #else 44 #define DO_NOT_DISCARD 45 #endif 39 46 40 47 #define memset(dst, val, cnt) __builtin_memset((dst), (val), (cnt)) … … 43 50 extern void memsetb(void *, size_t, uint8_t); 44 51 extern void memsetw(void *, size_t, uint16_t); 45 extern void *memmove(void *, const void *, size_t) ;52 extern void *memmove(void *, const void *, size_t) DO_NOT_DISCARD; 46 53 47 54 #endif -
kernel/generic/src/console/cmd.c
r7cd15b9 r6d5da743 1149 1149 int cmd_set4(cmd_arg_t *argv) 1150 1150 { 1151 uintptr_t addr ;1151 uintptr_t addr = 0; // Prevent -Werror=maybe-uninitialized 1152 1152 uint32_t arg1 = argv[1].intval; 1153 1153 bool pointer = false; -
kernel/generic/src/mm/as.c
r7cd15b9 r6d5da743 1725 1725 ASSERT(count); 1726 1726 1727 btree_node_t *leaf ;1727 btree_node_t *leaf = NULL; 1728 1728 size_t pages = (size_t) btree_search(&area->used_space, page, &leaf); 1729 1729 if (pages) { … … 1733 1733 return false; 1734 1734 } 1735 1736 ASSERT(leaf != NULL); 1735 1737 1736 1738 if (!leaf->keys) { -
kernel/generic/src/mm/frame.c
r7cd15b9 r6d5da743 391 391 392 392 /* Allocate frames from zone */ 393 size_t index ;393 size_t index = (size_t) -1; 394 394 int avail = bitmap_allocate_range(&zone->bitmap, count, zone->base, 395 395 FRAME_LOWPRIO, constraint, &index); 396 396 397 397 ASSERT(avail); 398 ASSERT(index != (size_t) -1); 398 399 399 400 /* Update frame reference count */ -
kernel/generic/src/udebug/udebug_ipc.c
r7cd15b9 r6d5da743 343 343 sysarg_t uspace_addr; 344 344 sysarg_t to_copy; 345 void *buffer ;345 void *buffer = NULL; 346 346 int rc; 347 347 … … 354 354 return; 355 355 } 356 357 ASSERT(buffer != NULL); 356 358 357 359 /* … … 385 387 sysarg_t uspace_src; 386 388 unsigned size; 387 void *buffer ;389 void *buffer = NULL; 388 390 int rc; 389 391 … … 398 400 return; 399 401 } 402 403 ASSERT(buffer != NULL); 400 404 401 405 IPC_SET_RETVAL(call->data, 0);
Note:
See TracChangeset
for help on using the changeset viewer.
