diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-04-01 11:43:08 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-04-01 11:43:08 +0000 |
| commit | 4c80b42683b88f933f87dbe79c0e94e336919938 (patch) | |
| tree | df19ddfcca3c9e28551d014957000da52bd47995 /usr/src/uts/i86pc/ml/notes.s | |
| parent | 88606cbe3645730adccc57e29f4b829af51c05f4 (diff) | |
| parent | 5338faaac2dc1b2a16cb1a986233578834926ce0 (diff) | |
| download | illumos-joyent-4c80b42683b88f933f87dbe79c0e94e336919938.tar.gz | |
[illumos-gate merge]
commit 5338faaac2dc1b2a16cb1a986233578834926ce0
12423 ipf: variable may be used uninitialized
commit 9b0bb795691f70ec1b1796f6d15266f82d7a3200
12349 clean up 32-bit assembly and lint
Conflicts:
usr/src/uts/sparc/v9/ml/lock_prim.s
usr/src/uts/intel/ia32/ml/lock_prim.s
usr/src/uts/intel/ia32/ml/copy.s
usr/src/uts/intel/Makefile.rules
usr/src/uts/i86pc/ml/syscall_asm_amd64.s
usr/src/uts/i86pc/ml/syscall_asm.s [deleted upstream]
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 |