apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

Browse Source 
* 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  ACPICA: Update version to 20110112
  ACPICA: Update all ACPICA copyrights and signons to 2011
  ACPICA: Fix issues/fault with automatic "serialized" method support
  ACPICA: Debugger: Lock namespace for duration of a namespace dump
  ACPICA: Fix namespace race condition
  ACPICA: Fix memory leak in acpi_ev_asynch_execute_gpe_method().
This commit is contained in:
Linus Torvalds
2011-01-20 16:28:34 -08:00
parent 28e58ee8ce 8d5f0a6473
commit e589501cb9
155 changed files with 267 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/acpi/acpica/accommon.h
+1 -1
View File
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2010, Intel Corp.
* Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
drivers/acpi/acpica/acconfig.h
+1 -1
View File
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2010, Intel Corp.
* Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
drivers/acpi/acpica/acdebug.h
+1 -1
View File
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2010, Intel Corp.
* Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
drivers/acpi/acpica/acdispat.h
+1 -1
View File
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2010, Intel Corp.
* Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
drivers/acpi/acpica/acevents.h
+1 -1
View File
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2010, Intel Corp.
* Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
drivers/acpi/acpica/acglobal.h
+1 -1
View File
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2010, Intel Corp.
* Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
drivers/acpi/acpica/achware.h
+1 -1
View File
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2010, Intel Corp.
* Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
drivers/acpi/acpica/acinterp.h
+1 -1
View File
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2010, Intel Corp.
* Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
drivers/acpi/acpica/aclocal.h
+1 -1
View File
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2010, Intel Corp.
* Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
drivers/acpi/acpica/acmacros.h
+1 -1
View File
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2010, Intel Corp.
* Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
drivers/acpi/acpica/acnamesp.h
+1 -1
View File
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2010, Intel Corp.
* Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
drivers/acpi/acpica/acobject.h
+11 -5
View File
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2010, Intel Corp.
* Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -97,8 +97,6 @@
#define AOPOBJ_OBJECT_INITIALIZED 0x08 /* Region is initialized, _REG was run */
#define AOPOBJ_SETUP_COMPLETE 0x10 /* Region setup is complete */
#define AOPOBJ_INVALID 0x20 /* Host OS won't allow a Region address */
#define AOPOBJ_MODULE_LEVEL 0x40 /* Method is actually module-level code */
#define AOPOBJ_MODIFIED_NAMESPACE 0x80 /* Method modified the namespace */
/******************************************************************************
*
@@ -175,7 +173,7 @@ struct acpi_object_region {
};
struct acpi_object_method {
ACPI_OBJECT_COMMON_HEADER u8 method_flags;
ACPI_OBJECT_COMMON_HEADER u8 info_flags;
u8 param_count;
u8 sync_level;
union acpi_operand_object *mutex;
@@ -183,13 +181,21 @@ struct acpi_object_method {
union {
ACPI_INTERNAL_METHOD implementation;
union acpi_operand_object *handler;
} extra;
} dispatch;
u32 aml_length;
u8 thread_count;
acpi_owner_id owner_id;
};
/* Flags for info_flags field above */
#define ACPI_METHOD_MODULE_LEVEL 0x01 /* Method is actually module-level code */
#define ACPI_METHOD_INTERNAL_ONLY 0x02 /* Method is implemented internally (_OSI) */
#define ACPI_METHOD_SERIALIZED 0x04 /* Method is serialized */
#define ACPI_METHOD_SERIALIZED_PENDING 0x08 /* Method is to be marked serialized */
#define ACPI_METHOD_MODIFIED_NAMESPACE 0x10 /* Method modified the namespace */
/******************************************************************************
*
* Objects that can be notified. All share a common notify_info area.
drivers/acpi/acpica/acopcode.h
+1 -1
View File
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2010, Intel Corp.
* Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
drivers/acpi/acpica/acparser.h
+1 -1
View File
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2010, Intel Corp.
* Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
drivers/acpi/acpica/acpredef.h
+1 -1
View File
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2010, Intel Corp.
* Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
drivers/acpi/acpica/acresrc.h
+1 -1
View File
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2010, Intel Corp.
* Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
drivers/acpi/acpica/acstruct.h
+1 -1
View File
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2010, Intel Corp.
* Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
drivers/acpi/acpica/actables.h
+1 -1
View File
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2010, Intel Corp.
* Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
drivers/acpi/acpica/acutils.h
+1 -1
View File
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2010, Intel Corp.
* Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
drivers/acpi/acpica/amlcode.h
+2 -8
View File
@@ -7,7 +7,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2010, Intel Corp.
* Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -480,16 +480,10 @@ typedef enum {
AML_FIELD_ATTRIB_SMB_BLOCK_CALL = 0x0D
} AML_ACCESS_ATTRIBUTE;
/* Bit fields in method_flags byte */
/* Bit fields in the AML method_flags byte */
#define AML_METHOD_ARG_COUNT 0x07
#define AML_METHOD_SERIALIZED 0x08
#define AML_METHOD_SYNC_LEVEL 0xF0
/* METHOD_FLAGS_ARG_COUNT is not used internally, define additional flags */
#define AML_METHOD_INTERNAL_ONLY 0x01
#define AML_METHOD_RESERVED1 0x02
#define AML_METHOD_RESERVED2 0x04
#endif /* __AMLCODE_H__ */

Some files were not shown because too many files have changed in this diff Show More