Print this page
PANKOVs restructure

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/intel/io/acpica/acpica.c
          +++ new/usr/src/uts/intel/io/acpica/acpica.c
↓ open down ↓ 10 lines elided ↑ open up ↑
  11   11   * and limitations under the License.
  12   12   *
  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
       21 +
  21   22  /*
  22   23   * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  23   24   * Copyright (c) 2011, Joyent, Inc. All rights reserved.
  24      - * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
       25 + * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
  25   26   */
       27 +
  26   28  /*
  27   29   * Copyright (c) 2009, Intel Corporation.
  28   30   * All rights reserved.
  29   31   */
       32 +
  30   33  /*
  31      - * Solaris x86 ACPI CA services
       34 + * x86 ACPI CA services
  32   35   */
  33   36  
  34   37  #include <sys/file.h>
  35   38  #include <sys/errno.h>
  36   39  #include <sys/conf.h>
  37   40  #include <sys/modctl.h>
  38   41  #include <sys/open.h>
  39   42  #include <sys/stat.h>
  40   43  #include <sys/spl.h>
  41   44  #include <sys/ddi.h>
  42   45  #include <sys/sunddi.h>
  43   46  #include <sys/esunddi.h>
  44   47  #include <sys/kstat.h>
  45   48  #include <sys/x86_archext.h>
  46   49  
  47      -#include <sys/acpi/acpi.h>
       50 +#include <acpica/include/acpi.h>
  48   51  #include <sys/acpica.h>
  49   52  #include <sys/archsystm.h>
  50   53  
  51   54  /*
  52   55   *
  53   56   */
  54   57  static  struct modlmisc modlmisc = {
  55   58          &mod_miscops,
  56   59          "ACPI interpreter",
  57   60  };
↓ open down ↓ 337 lines elided ↑ open up ↑
 395  398           * options to avoid entering ACPI mode and hooking SCI
 396  399           * - basically try to act like legacy acpi_intp
 397  400           */
 398  401          if ((acpi_user_options & ACPI_OUSER_LEGACY) != 0)
 399  402                  acpi_init_level |= (ACPI_NO_ACPI_ENABLE | ACPI_NO_HANDLER_INIT);
 400  403  
 401  404          /*
 402  405           * modify default ACPI CA debug output level for non-DEBUG builds
 403  406           * (to avoid BIOS debug chatter in /var/adm/messages)
 404  407           */
 405      -        if (acpica_muzzle_debug_output)
      408 +        if (acpica_muzzle_debug_output) {
      409 +                AcpiDbgLayer = 0;
 406  410                  AcpiDbgLevel = 0;
      411 +        }
 407  412  }
 408  413  
 409  414  /*
 410  415   * Initialize the CA subsystem if it hasn't been done already
 411  416   */
 412  417  int
 413  418  acpica_init()
 414  419  {
 415  420          extern void acpica_find_ioapics(void);
 416  421          ACPI_STATUS status;
↓ open down ↓ 481 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX