Re: BUG: spinlock bad magic on CPU#0

[Sergey Senozhatsky]

On (01/14/11 22:09), Rafael J. Wysocki wrote:
> > Hello,
> 
> Does the appended patch help?
> 
>

Hello,
Yes, it does. Seems to be fixed.

Tested-by: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx>


Thanks,
	Sergey

 
> ---
>  drivers/acpi/acpica/acglobal.h |    2 ++
>  drivers/acpi/acpica/evmisc.c   |    2 --
>  drivers/acpi/acpica/utmutex.c  |    1 +
>  3 files changed, 3 insertions(+), 2 deletions(-)
> 
> Index: linux-2.6/drivers/acpi/acpica/acglobal.h
> ===================================================================
> --- linux-2.6.orig/drivers/acpi/acpica/acglobal.h
> +++ linux-2.6/drivers/acpi/acpica/acglobal.h
> @@ -228,8 +228,10 @@ ACPI_EXTERN u8 acpi_gbl_global_lock_pres
>   */
>  ACPI_EXTERN spinlock_t _acpi_gbl_gpe_lock;	/* For GPE data structs and registers */
>  ACPI_EXTERN spinlock_t _acpi_gbl_hardware_lock;	/* For ACPI H/W except GPE registers */
> +ACPI_EXTERN spinlock_t _acpi_ev_global_lock_pending_lock; /* For global lock */
>  #define acpi_gbl_gpe_lock	&_acpi_gbl_gpe_lock
>  #define acpi_gbl_hardware_lock	&_acpi_gbl_hardware_lock
> +#define acpi_ev_global_lock_pending_lock &_acpi_ev_global_lock_pending_lock
>  
>  /*****************************************************************************
>   *
> Index: linux-2.6/drivers/acpi/acpica/evmisc.c
> ===================================================================
> --- linux-2.6.orig/drivers/acpi/acpica/evmisc.c
> +++ linux-2.6/drivers/acpi/acpica/evmisc.c
> @@ -293,8 +293,6 @@ static void ACPI_SYSTEM_XFACE acpi_ev_no
>   *
>   ******************************************************************************/
>  static u8 acpi_ev_global_lock_pending;
> -static spinlock_t _acpi_ev_global_lock_pending_lock;
> -#define acpi_ev_global_lock_pending_lock &_acpi_ev_global_lock_pending_lock
>  
>  static u32 acpi_ev_global_lock_handler(void *context)
>  {
> Index: linux-2.6/drivers/acpi/acpica/utmutex.c
> ===================================================================
> --- linux-2.6.orig/drivers/acpi/acpica/utmutex.c
> +++ linux-2.6/drivers/acpi/acpica/utmutex.c
> @@ -85,6 +85,7 @@ acpi_status acpi_ut_mutex_initialize(voi
>  
>  	spin_lock_init(acpi_gbl_gpe_lock);
>  	spin_lock_init(acpi_gbl_hardware_lock);
> +	spin_lock_init(acpi_ev_global_lock_pending_lock);
>  
>  	/* Mutex for _OSI support */
>  	status = acpi_os_create_mutex(&acpi_gbl_osi_mutex);
>

Attachment: pgp00000.pgp
Description: PGP signature