diff options
| author | John Levon <john.levon@joyent.com> | 2020-04-01 14:58:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-01 14:58:25 +0100 |
| commit | a4a43b983024104a82e95c2647b94f767d62a8eb (patch) | |
| tree | 57ccba9faa7b25da0ab082799ac1d41fe9447caa /usr/src/uts/i86pc/ml/notes.s | |
| parent | 280f87530631a519eb45e763050d2e0b3e55d499 (diff) | |
| parent | f559d4b8282f7f6a9c3e1546000352c62e12481a (diff) | |
| download | illumos-joyent-OS-8148.tar.gz | |
Merge branch 'master' into OS-8148OS-8148
Diffstat (limited to 'usr/src/uts/i86pc/ml/notes.s')
| -rw-r--r-- | usr/src/uts/i86pc/ml/notes.s | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/usr/src/uts/i86pc/ml/notes.s b/usr/src/uts/i86pc/ml/notes.s index 72ae373813..331e7e8197 100644 --- a/usr/src/uts/i86pc/ml/notes.s +++ b/usr/src/uts/i86pc/ml/notes.s @@ -21,21 +21,18 @@ * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ - -#include <sys/elf_notes.h> -#pragma ident "%Z%%M% %I% %E% SMI" +/* + * Copyright 2019 Joyent, Inc. + */ -#if defined(lint) -#include <sys/types.h> -#else +#include <sys/elf_notes.h> #include "assym.h" -/ -/ Tell the booter that we'd like to load unix on a large page -/ if the chip supports it. -/ +/* + * Tell the booter that we'd like to load unix on a large page. + */ .section .note .align 4 .4byte .name1_end - .name1_begin @@ -49,4 +46,3 @@ .4byte FOUR_MEG .desc1_end: .align 4 -#endif |