diff options
| author | Andy Fiddaman <illumos@fiddaman.net> | 2022-12-07 11:43:06 +0000 |
|---|---|---|
| committer | Andy Fiddaman <illumos@fiddaman.net> | 2022-12-09 21:21:17 +0000 |
| commit | 9e3aeadeb229d472ee0ae8425dc913dfe7e81ea2 (patch) | |
| tree | 9c44f060d905b8e3d1c32114870964dcd01bce77 | |
| parent | 4e320a8a375380e6f3963134cd6c1001e2bdb7fa (diff) | |
| download | illumos-joyent-9e3aeadeb229d472ee0ae8425dc913dfe7e81ea2.tar.gz | |
15238 prom_reboot/panic should be machdep
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Reviewed by: Keith M Wesolowski <wesolows@oxide.computer>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Dan McDonald <danmcd@mnx.io>
| -rw-r--r-- | usr/src/uts/i86pc/Makefile.files | 2 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/Makefile.rules | 5 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/promif/prom_panic.c (renamed from usr/src/uts/intel/promif/prom_panic.c) | 0 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/promif/prom_reboot.c (renamed from usr/src/uts/intel/promif/prom_reboot.c) | 2 | ||||
| -rw-r--r-- | usr/src/uts/i86xpv/Makefile.files | 3 | ||||
| -rw-r--r-- | usr/src/uts/i86xpv/Makefile.rules | 4 | ||||
| -rw-r--r-- | usr/src/uts/intel/Makefile.files | 2 |
7 files changed, 14 insertions, 4 deletions
diff --git a/usr/src/uts/i86pc/Makefile.files b/usr/src/uts/i86pc/Makefile.files index 064cda8548..11f6af52ee 100644 --- a/usr/src/uts/i86pc/Makefile.files +++ b/usr/src/uts/i86pc/Makefile.files @@ -113,6 +113,8 @@ CORE_OBJS += \ pci_orion.o \ pmem.o \ ppage.o \ + prom_panic.o \ + prom_reboot.o \ pwrnow.o \ speedstep.o \ ssp.o \ diff --git a/usr/src/uts/i86pc/Makefile.rules b/usr/src/uts/i86pc/Makefile.rules index 9fe73c00f5..af57055292 100644 --- a/usr/src/uts/i86pc/Makefile.rules +++ b/usr/src/uts/i86pc/Makefile.rules @@ -24,6 +24,7 @@ # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com> # Copyright 2019 Joyent, Inc. # Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2022 Oxide Computer Company # # This Makefile defines the build rules for the directory uts/i86pc @@ -173,6 +174,10 @@ $(OBJS_DIR)/%.o: $(UTSBASE)/i86pc/os/cpupm/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) +$(OBJS_DIR)/%.o: $(UTSBASE)/i86pc/promif/%.c + $(COMPILE.c) -o $@ $< + $(CTFCONVERT_O) + $(OBJS_DIR)/%.o: $(UTSBASE)/i86pc/boot/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) diff --git a/usr/src/uts/intel/promif/prom_panic.c b/usr/src/uts/i86pc/promif/prom_panic.c index 181d13bead..181d13bead 100644 --- a/usr/src/uts/intel/promif/prom_panic.c +++ b/usr/src/uts/i86pc/promif/prom_panic.c diff --git a/usr/src/uts/intel/promif/prom_reboot.c b/usr/src/uts/i86pc/promif/prom_reboot.c index be7de23a23..be651c2783 100644 --- a/usr/src/uts/intel/promif/prom_reboot.c +++ b/usr/src/uts/i86pc/promif/prom_reboot.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/promif.h> #include <sys/promimpl.h> #include <sys/bootsvcs.h> diff --git a/usr/src/uts/i86xpv/Makefile.files b/usr/src/uts/i86xpv/Makefile.files index 5c9acfabed..40d22b6029 100644 --- a/usr/src/uts/i86xpv/Makefile.files +++ b/usr/src/uts/i86xpv/Makefile.files @@ -23,6 +23,7 @@ # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. # # Copyright 2019 Joyent, Inc. +# Copyright 2022 Oxide Computer Company # # This Makefile defines file modules in the directory uts/i86xpv @@ -95,6 +96,8 @@ CORE_OBJS += \ pci_orion.o \ pmem.o \ ppage.o \ + prom_reboot.o \ + prom_panic.o \ startup.o \ ssp.o \ xpv_timestamp.o \ diff --git a/usr/src/uts/i86xpv/Makefile.rules b/usr/src/uts/i86xpv/Makefile.rules index dfabbd6897..85d91a3a87 100644 --- a/usr/src/uts/i86xpv/Makefile.rules +++ b/usr/src/uts/i86xpv/Makefile.rules @@ -90,6 +90,10 @@ $(OBJS_DIR)/%.o: $(UTSBASE)/i86xpv/vm/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) +$(OBJS_DIR)/%.o: $(UTSBASE)/i86pc/promif/%.c + $(COMPILE.c) -o $@ $< + $(CTFCONVERT_O) + $(OBJS_DIR)/%.o: $(UTSBASE)/i86xpv/boot/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) diff --git a/usr/src/uts/intel/Makefile.files b/usr/src/uts/intel/Makefile.files index 4336f77a23..20d5e89ec9 100644 --- a/usr/src/uts/intel/Makefile.files +++ b/usr/src/uts/intel/Makefile.files @@ -74,7 +74,6 @@ GENUNIX_OBJS += \ lwp_private.o \ prom_enter.o \ prom_exit.o \ - prom_panic.o \ sendsig.o \ syscall.o @@ -91,7 +90,6 @@ GENUNIX_OBJS += \ prom_printf.o \ prom_prop.o \ prom_putchar.o \ - prom_reboot.o \ prom_version.o # |