diff options
| author | Patrick Georgi <pgeorgi@google.com> | 2014-11-29 10:38:17 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2014-12-02 10:25:55 +0100 |
| commit | 546953c0c553465761705fb0747964c08d634461 (patch) | |
| tree | 6cbd36b46d1230bb36a557849ac9e711a16917f1 /src/southbridge/intel/ibexpeak | |
| parent | 24cca75b47f516e2ad226c37da1e71aef5036fce (diff) | |
Replace hlt with halt()
There were instances of unneeded arch/hlt.h includes,
various hlt() calls that weren't supposed to exit (but
might have) and various forms of endless loops around
hlt() calls.
All these are sorted out now: unnecessary includes are
dropped, hlt() is uniformly replaced with halt() (except
in assembly, obviously).
Change-Id: I3d38fed6e8d67a28fdeb17be803d8c4b62d383c5
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: http://review.coreboot.org/7608
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'src/southbridge/intel/ibexpeak')
| -rw-r--r-- | src/southbridge/intel/ibexpeak/me.c | 1 | ||||
| -rw-r--r-- | src/southbridge/intel/ibexpeak/smihandler.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/southbridge/intel/ibexpeak/me.c b/src/southbridge/intel/ibexpeak/me.c index 99920f55a2..f94b17fab9 100644 --- a/src/southbridge/intel/ibexpeak/me.c +++ b/src/southbridge/intel/ibexpeak/me.c @@ -28,7 +28,6 @@ */ #include <arch/acpi.h> -#include <arch/hlt.h> #include <arch/io.h> #include <console/console.h> #include <device/pci_ids.h> diff --git a/src/southbridge/intel/ibexpeak/smihandler.c b/src/southbridge/intel/ibexpeak/smihandler.c index bc4ca22c59..b6ca5235dd 100644 --- a/src/southbridge/intel/ibexpeak/smihandler.c +++ b/src/southbridge/intel/ibexpeak/smihandler.c @@ -20,13 +20,13 @@ */ #include <types.h> -#include <arch/hlt.h> #include <arch/io.h> #include <console/console.h> #include <cpu/x86/cache.h> #include <device/pci_def.h> #include <cpu/x86/smm.h> #include <elog.h> +#include <halt.h> #include <pc80/mc146818rtc.h> #include "pch.h" @@ -474,7 +474,7 @@ static void southbridge_smi_sleep(unsigned int node, smm_state_save_area_t *stat /* Make sure to stop executing code here for S3/S4/S5 */ if (slp_typ > 1) - hlt(); + halt(); /* In most sleep states, the code flow of this function ends at * the line above. However, if we entered sleep state S1 and wake |