Changeset e40ece98 in mainline

Timestamp:

2012-05-01T07:58:55Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

9fc72fb3

Parents:

296ef5d6 (diff), d21e935c (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.

Message:

Merge with mainline

Files:

• HelenOS.config (modified) (1 diff)
• kernel/genarch/src/fb/fb.c (modified) (1 diff)
• uspace/app/inetcfg/inetcfg.c (modified) (1 diff)

HelenOS.config

@@ -556 +556 @@
 
 % Include development files (headers, libraries)
-! [RDFMT=tmpfs|RDFMT=ext2fs] CONFIG_DEVEL_FILES (n/y)
+! CONFIG_DEVEL_FILES (n/y)
 
 % Strip binaries

kernel/genarch/src/fb/fb.c

@@ -390 +390 @@
                             instance->position / instance->cols, false);
                         instance->position++;
-                } while ((instance->position % 8)
-                    && (instance->position < instance->cols * instance->rows));
+                } while (((instance->position % instance->cols) % 8 != 0) &&
+                    (instance->position < instance->cols * instance->rows));
                 break;
         default:

uspace/app/inetcfg/inetcfg.c

@@ -35 +35 @@
  */
 
-#include <async.h>
 #include <errno.h>
 #include <inet/inetcfg.h>