Changeset ab936440 in mainline for kernel/generic/include/bitops.h

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (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.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

• kernel/generic/include/bitops.h (modified) (2 diffs)

kernel/generic/include/bitops.h

@@ -52 +52 @@
  *
  */
-NO_TRACE static inline uint8_t fnzb32(uint32_t arg)
+_NO_TRACE static inline uint8_t fnzb32(uint32_t arg)
 {
         uint8_t n = 0;
@@ -87 +87 @@
  *
  */
-NO_TRACE static inline uint8_t fnzb64(uint64_t arg)
+_NO_TRACE static inline uint8_t fnzb64(uint64_t arg)
 {
         uint8_t n = 0;