From 571b7b211893e09c05287dda773579d367df548c Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Mon, 8 Jul 2019 23:25:05 +0300 Subject: intel/i82801ix: Rename smm_lock() prototype MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This southbridge code may be built with either ASEG or TSEG. Fix minor collision in namespaces. Change-Id: I04f90fb308c280621a3037fee4bece1e5655480e Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/34153 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Arthur Heymans --- src/southbridge/intel/i82801ix/lpc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/southbridge/intel/i82801ix/lpc.c') diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c index c7de2a14df..546fbced77 100644 --- a/src/southbridge/intel/i82801ix/lpc.c +++ b/src/southbridge/intel/i82801ix/lpc.c @@ -366,7 +366,6 @@ static void enable_clock_gating(void) RCBA32(0x38c0) |= 7; } -#if CONFIG(HAVE_SMI_HANDLER) static void i82801ix_lock_smm(struct device *dev) { if (!acpi_is_wakeup_s3()) { @@ -387,9 +386,8 @@ static void i82801ix_lock_smm(struct device *dev) * userspace applications to deceive us: */ if (!CONFIG(PARALLEL_MP)) - smm_lock(); + aseg_smm_lock(); } -#endif static void lpc_init(struct device *dev) { @@ -431,9 +429,8 @@ static void lpc_init(struct device *dev) /* Interrupt 9 should be level triggered (SCI) */ i8259_configure_irq_trigger(9, 1); -#if CONFIG(HAVE_SMI_HANDLER) - i82801ix_lock_smm(dev); -#endif + if (CONFIG(HAVE_SMI_HANDLER)) + i82801ix_lock_smm(dev); } static void i82801ix_lpc_read_resources(struct device *dev) -- cgit v1.2.3