Changeset 97c7682 in mainline for kernel/genarch/src/fb/fb.c

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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 mainline changes.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• kernel/genarch/src/fb/fb.c (modified) (1 diff)

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: