Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 014f4039 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpica' 

* acpica: (22 commits)
  ACPICA: Update version to 20170119
  ACPICA: Tools: Update common signon, remove compilation bit width
  ACPICA: Source tree: Update copyright notices to 2017
  ACPICA: Linuxize: Restore and fix Intel compiler build
  ACPICA: Update version to 20161222
  ACPICA: Parser: Update parse info table for some operators
  ACPICA: Fix a problem with recent extra support for control method invocations
  ACPICA: Parser: Allow method invocations as target operands
  ACPICA: Fix for implicit result conversion for the ToXXX functions
  ACPICA: Resources: Not a valid resource if buffer length too long
  ACPICA: Utilities: Update debug output
  ACPICA: Disassembler: Add Switch/Case disassembly support
  ACPICA: EFI: Add efihello demo application
  ACPICA: MSVC: Fix MSVC6 build issues
  ACPICA: Linux-specific header: Add support for s390x compilation
  ACPICA: Hardware: Add sleep register hooks
  ACPICA: Macro header: Fix some typos in comments
  ACPICA: Hardware: Sort access bit width algorithm
  ACPICA: Utilities: Add power of two rounding support
  ACPICA: Hardware: Add access_width/bit_offset support in acpi_hw_write()
  ...
parents 7089db84 09747213

drivers/acpi/acpica/acapps.h

+7 −7
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *****************************************************************************/



/*

 * Copyright (C) 2000 - 2016, Intel Corp.

 * Copyright (C) 2000 - 2017, Intel Corp.

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -51,26 +51,26 @@ 
/* Common info for tool signons */



#define ACPICA_NAME                 "Intel ACPI Component Architecture"

#define ACPICA_COPYRIGHT            "Copyright (c) 2000 - 2016 Intel Corporation"

#define ACPICA_COPYRIGHT            "Copyright (c) 2000 - 2017 Intel Corporation"



#if ACPI_MACHINE_WIDTH == 64

#define ACPI_WIDTH          "-64"

#define ACPI_WIDTH          " (64-bit version)"



#elif ACPI_MACHINE_WIDTH == 32

#define ACPI_WIDTH          "-32"

#define ACPI_WIDTH          " (32-bit version)"



#else

#error unknown ACPI_MACHINE_WIDTH

#define ACPI_WIDTH          "-??"

#define ACPI_WIDTH          " (unknown bit width, not 32 or 64)"



#endif



/* Macros for signons and file headers */



#define ACPI_COMMON_SIGNON(utility_name) \

	"\n%s\n%s version %8.8X%s\n%s\n\n", \

	"\n%s\n%s version %8.8X\n%s\n\n", \

	ACPICA_NAME, \

	utility_name, ((u32) ACPI_CA_VERSION), ACPI_WIDTH, \

	utility_name, ((u32) ACPI_CA_VERSION), \

	ACPICA_COPYRIGHT



#define ACPI_COMMON_HEADER(utility_name, prefix) \

drivers/acpi/acpica/accommon.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *****************************************************************************/



/*

 * Copyright (C) 2000 - 2016, Intel Corp.

 * Copyright (C) 2000 - 2017, Intel Corp.

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acdebug.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *****************************************************************************/



/*

 * Copyright (C) 2000 - 2016, Intel Corp.

 * Copyright (C) 2000 - 2017, Intel Corp.

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acdispat.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *****************************************************************************/



/*

 * Copyright (C) 2000 - 2016, Intel Corp.

 * Copyright (C) 2000 - 2017, Intel Corp.

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acevents.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *****************************************************************************/



/*

 * Copyright (C) 2000 - 2016, Intel Corp.

 * Copyright (C) 2000 - 2017, Intel Corp.

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without