diff options
| author | ian <ian@FreeBSD.org> | 2014-05-14 01:16:05 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2014-05-14 01:16:05 +0000 |
| commit | 147aa314a7ea59fab69a92349cee312e49cae2bb (patch) | |
| tree | b553b4077fe2c8c6098e20d3d69729a8bc8e9c11 /sys/boot | |
| parent | 2963fd0dfbdafac049cadecf0774e0c027b28c88 (diff) | |
| download | FreeBSD-src-147aa314a7ea59fab69a92349cee312e49cae2bb.zip FreeBSD-src-147aa314a7ea59fab69a92349cee312e49cae2bb.tar.gz | |
MFC r257180, r257195, r257196, r257198, r257209, r257295
Add some extra sanity checking and checks to printf format specifiers.
Try even harder to find a console before giving up.
Make devices with registers into the KVA region work reliably.
Turn on VM_KMEM_SIZE_SCALE on 32-bit as well as 64-bit PowerPC.
Return NOKEY instead of 0 if there are no more key presses queued.
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/powerpc/ps3/start.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/boot/powerpc/ps3/start.S b/sys/boot/powerpc/ps3/start.S index 865019c..570b3f5 100644 --- a/sys/boot/powerpc/ps3/start.S +++ b/sys/boot/powerpc/ps3/start.S @@ -27,7 +27,7 @@ #define LOCORE -#include <machine/trap_aim.h> +#include <machine/trap.h> /* * KBoot and simulators will start this program from the _start symbol, with |
