Changeset 3e828ea in mainline for kernel/arch/ppc32/include

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

Location:

kernel/arch/ppc32/include/arch/mm

Files:

• as.h (modified) (1 diff)
• page.h (modified) (2 diffs)

kernel/arch/ppc32/include/arch/mm/as.h

@@ -39 +39 @@
 
 #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH  0
+#define KERNEL_SEPARATE_PTL0_ARCH           0
 
 #define KERNEL_ADDRESS_SPACE_START_ARCH  UINT32_C(0x80000000)

kernel/arch/ppc32/include/arch/mm/page.h

@@ -37 +37 @@
 
 #include <arch/mm/frame.h>
-#include <trace.h>
 
 #define PAGE_WIDTH  FRAME_WIDTH
@@ -150 +149 @@
 #include <mm/mm.h>
 #include <arch/interrupt.h>
+#include <trace.h>
 
 /** Page Table Entry. */