Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
fd350943
Commit
fd350943
authored
May 09, 2007
by
Len Brown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ACPICA: Lindent
Signed-off-by:
Len Brown
<
len.brown@intel.com
>
parent
88db5e14
Changes
55
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
55 changed files
with
443 additions
and
466 deletions
+443
-466
drivers/acpi/dispatcher/dsopcode.c
drivers/acpi/dispatcher/dsopcode.c
+1
-2
drivers/acpi/dispatcher/dsutils.c
drivers/acpi/dispatcher/dsutils.c
+3
-4
drivers/acpi/dispatcher/dswstate.c
drivers/acpi/dispatcher/dswstate.c
+3
-6
drivers/acpi/events/evgpe.c
drivers/acpi/events/evgpe.c
+2
-3
drivers/acpi/events/evgpeblk.c
drivers/acpi/events/evgpeblk.c
+1
-2
drivers/acpi/events/evmisc.c
drivers/acpi/events/evmisc.c
+6
-3
drivers/acpi/events/evrgnini.c
drivers/acpi/events/evrgnini.c
+2
-1
drivers/acpi/events/evxface.c
drivers/acpi/events/evxface.c
+0
-1
drivers/acpi/events/evxfevnt.c
drivers/acpi/events/evxfevnt.c
+0
-2
drivers/acpi/executer/exconvrt.c
drivers/acpi/executer/exconvrt.c
+2
-3
drivers/acpi/executer/excreate.c
drivers/acpi/executer/excreate.c
+0
-1
drivers/acpi/executer/exdump.c
drivers/acpi/executer/exdump.c
+6
-9
drivers/acpi/executer/exmutex.c
drivers/acpi/executer/exmutex.c
+2
-1
drivers/acpi/executer/exnames.c
drivers/acpi/executer/exnames.c
+1
-2
drivers/acpi/executer/exprep.c
drivers/acpi/executer/exprep.c
+1
-1
drivers/acpi/executer/exresop.c
drivers/acpi/executer/exresop.c
+1
-2
drivers/acpi/hardware/hwsleep.c
drivers/acpi/hardware/hwsleep.c
+0
-1
drivers/acpi/namespace/nseval.c
drivers/acpi/namespace/nseval.c
+1
-1
drivers/acpi/namespace/nswalk.c
drivers/acpi/namespace/nswalk.c
+2
-4
drivers/acpi/namespace/nsxfeval.c
drivers/acpi/namespace/nsxfeval.c
+2
-4
drivers/acpi/parser/psopcode.c
drivers/acpi/parser/psopcode.c
+306
-312
drivers/acpi/resources/rscalc.c
drivers/acpi/resources/rscalc.c
+2
-1
drivers/acpi/resources/rscreate.c
drivers/acpi/resources/rscreate.c
+8
-5
drivers/acpi/resources/rsdump.c
drivers/acpi/resources/rsdump.c
+3
-5
drivers/acpi/resources/rsinfo.c
drivers/acpi/resources/rsinfo.c
+1
-1
drivers/acpi/resources/rslist.c
drivers/acpi/resources/rslist.c
+3
-4
drivers/acpi/resources/rsmisc.c
drivers/acpi/resources/rsmisc.c
+1
-3
drivers/acpi/resources/rsutils.c
drivers/acpi/resources/rsutils.c
+2
-4
drivers/acpi/resources/rsxface.c
drivers/acpi/resources/rsxface.c
+0
-3
drivers/acpi/sleep/main.c
drivers/acpi/sleep/main.c
+1
-2
drivers/acpi/sleep/proc.c
drivers/acpi/sleep/proc.c
+5
-6
drivers/acpi/tables/tbfadt.c
drivers/acpi/tables/tbfadt.c
+4
-2
drivers/acpi/tables/tbxface.c
drivers/acpi/tables/tbxface.c
+8
-8
drivers/acpi/utilities/utalloc.c
drivers/acpi/utilities/utalloc.c
+0
-1
drivers/acpi/utilities/utcache.c
drivers/acpi/utilities/utcache.c
+1
-2
drivers/acpi/utilities/utcopy.c
drivers/acpi/utilities/utcopy.c
+3
-1
drivers/acpi/utilities/utdebug.c
drivers/acpi/utilities/utdebug.c
+2
-2
drivers/acpi/utilities/utglobal.c
drivers/acpi/utilities/utglobal.c
+2
-4
drivers/acpi/utilities/utmisc.c
drivers/acpi/utilities/utmisc.c
+3
-3
drivers/acpi/utilities/utmutex.c
drivers/acpi/utilities/utmutex.c
+4
-4
drivers/acpi/utilities/utresrc.c
drivers/acpi/utilities/utresrc.c
+0
-1
drivers/acpi/utilities/utxface.c
drivers/acpi/utilities/utxface.c
+0
-2
include/acpi/acdispat.h
include/acpi/acdispat.h
+3
-6
include/acpi/acglobal.h
include/acpi/acglobal.h
+1
-1
include/acpi/aclocal.h
include/acpi/aclocal.h
+1
-1
include/acpi/acnamesp.h
include/acpi/acnamesp.h
+2
-4
include/acpi/acobject.h
include/acpi/acobject.h
+1
-1
include/acpi/acpi_bus.h
include/acpi/acpi_bus.h
+5
-4
include/acpi/acpi_drivers.h
include/acpi/acpi_drivers.h
+4
-2
include/acpi/acpi_numa.h
include/acpi/acpi_numa.h
+1
-1
include/acpi/acpiosxf.h
include/acpi/acpiosxf.h
+2
-1
include/acpi/actypes.h
include/acpi/actypes.h
+1
-1
include/acpi/acutils.h
include/acpi/acutils.h
+2
-1
include/acpi/platform/aclinux.h
include/acpi/platform/aclinux.h
+14
-7
include/acpi/processor.h
include/acpi/processor.h
+11
-7
No files found.
drivers/acpi/dispatcher/dsopcode.c
View file @
fd350943
...
...
@@ -866,8 +866,7 @@ acpi_ds_eval_data_object_operands(struct acpi_walk_state *walk_state,
((
op
->
common
.
parent
->
common
.
aml_opcode
!=
AML_PACKAGE_OP
)
&&
(
op
->
common
.
parent
->
common
.
aml_opcode
!=
AML_VAR_PACKAGE_OP
)
&&
(
op
->
common
.
parent
->
common
.
aml_opcode
!=
AML_NAME_OP
)))
{
&&
(
op
->
common
.
parent
->
common
.
aml_opcode
!=
AML_NAME_OP
)))
{
walk_state
->
result_obj
=
obj_desc
;
}
}
...
...
drivers/acpi/dispatcher/dsutils.c
View file @
fd350943
...
...
@@ -556,10 +556,9 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
* indicate this to the interpreter, set the
* object to the root
*/
obj_desc
=
ACPI_CAST_PTR
(
union
acpi_operand_object
,
acpi_gbl_root_node
);
obj_desc
=
ACPI_CAST_PTR
(
union
acpi_operand_object
,
acpi_gbl_root_node
);
status
=
AE_OK
;
}
else
{
/*
...
...
drivers/acpi/dispatcher/dswstate.c
View file @
fd350943
...
...
@@ -630,12 +630,9 @@ struct acpi_walk_state *acpi_ds_pop_walk_state(struct acpi_thread_state *thread)
*
******************************************************************************/
struct
acpi_walk_state
*
acpi_ds_create_walk_state
(
acpi_owner_id
owner_id
,
union
acpi_parse_object
*
origin
,
union
acpi_operand_object
*
method_desc
,
struct
acpi_thread_state
struct
acpi_walk_state
*
acpi_ds_create_walk_state
(
acpi_owner_id
owner_id
,
union
acpi_parse_object
*
origin
,
union
acpi_operand_object
*
method_desc
,
struct
acpi_thread_state
*
thread
)
{
struct
acpi_walk_state
*
walk_state
;
...
...
drivers/acpi/events/evgpe.c
View file @
fd350943
...
...
@@ -341,9 +341,8 @@ struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,
/* A Non-NULL gpe_device means this is a GPE Block Device */
obj_desc
=
acpi_ns_get_attached_object
((
struct
acpi_namespace_node
*
)
gpe_device
);
obj_desc
=
acpi_ns_get_attached_object
((
struct
acpi_namespace_node
*
)
gpe_device
);
if
(
!
obj_desc
||
!
obj_desc
->
device
.
gpe_block
)
{
return
(
NULL
);
}
...
...
drivers/acpi/events/evgpeblk.c
View file @
fd350943
...
...
@@ -1033,8 +1033,7 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
if
(((
gpe_event_info
->
flags
&
ACPI_GPE_DISPATCH_MASK
)
==
ACPI_GPE_DISPATCH_METHOD
)
&&
(
gpe_event_info
->
flags
&
ACPI_GPE_TYPE_RUNTIME
))
{
&&
(
gpe_event_info
->
flags
&
ACPI_GPE_TYPE_RUNTIME
))
{
gpe_enabled_count
++
;
}
...
...
drivers/acpi/events/evmisc.c
View file @
fd350943
...
...
@@ -320,8 +320,9 @@ static u32 acpi_ev_global_lock_handler(void *context)
acpi_gbl_global_lock_acquired
=
TRUE
;
/* Send a unit to the semaphore */
if
(
ACPI_FAILURE
(
acpi_os_signal_semaphore
(
acpi_gbl_global_lock_semaphore
,
1
)))
{
if
(
ACPI_FAILURE
(
acpi_os_signal_semaphore
(
acpi_gbl_global_lock_semaphore
,
1
)))
{
ACPI_ERROR
((
AE_INFO
,
"Could not signal Global Lock semaphore"
));
}
...
...
@@ -447,7 +448,9 @@ acpi_status acpi_ev_acquire_global_lock(u16 timeout)
}
if
(
ACPI_FAILURE
(
status
))
{
status
=
acpi_ex_system_wait_mutex
(
acpi_gbl_global_lock_mutex
,
timeout
);
status
=
acpi_ex_system_wait_mutex
(
acpi_gbl_global_lock_mutex
,
timeout
);
}
if
(
ACPI_FAILURE
(
status
))
{
return_ACPI_STATUS
(
status
);
...
...
drivers/acpi/events/evrgnini.c
View file @
fd350943
...
...
@@ -228,7 +228,8 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
/* Install a handler for this PCI root bridge */
status
=
acpi_install_address_space_handler
((
acpi_handle
)
pci_root_node
,
ACPI_ADR_SPACE_PCI_CONFIG
,
ACPI_DEFAULT_HANDLER
,
NULL
,
NULL
);
status
=
acpi_install_address_space_handler
((
acpi_handle
)
pci_root_node
,
ACPI_ADR_SPACE_PCI_CONFIG
,
ACPI_DEFAULT_HANDLER
,
NULL
,
NULL
);
if
(
ACPI_FAILURE
(
status
))
{
if
(
status
==
AE_SAME_HANDLER
)
{
/*
...
...
drivers/acpi/events/evxface.c
View file @
fd350943
...
...
@@ -91,7 +91,6 @@ acpi_status acpi_install_exception_handler(acpi_exception_handler handler)
ACPI_EXPORT_SYMBOL
(
acpi_install_exception_handler
)
#endif
/* ACPI_FUTURE_USAGE */
/*******************************************************************************
*
* FUNCTION: acpi_install_fixed_event_handler
...
...
drivers/acpi/events/evxfevnt.c
View file @
fd350943
...
...
@@ -472,7 +472,6 @@ acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)
}
ACPI_EXPORT_SYMBOL
(
acpi_clear_gpe
)
#ifdef ACPI_FUTURE_USAGE
/*******************************************************************************
*
...
...
@@ -568,7 +567,6 @@ acpi_get_gpe_status(acpi_handle gpe_device,
ACPI_EXPORT_SYMBOL
(
acpi_get_gpe_status
)
#endif
/* ACPI_FUTURE_USAGE */
/*******************************************************************************
*
* FUNCTION: acpi_install_gpe_block
...
...
drivers/acpi/executer/exconvrt.c
View file @
fd350943
...
...
@@ -512,9 +512,8 @@ acpi_ex_convert_to_string(union acpi_operand_object * obj_desc,
* Create a new string object and string buffer
* (-1 because of extra separator included in string_length from above)
*/
return_desc
=
acpi_ut_create_string_object
((
acpi_size
)
(
string_length
-
1
));
return_desc
=
acpi_ut_create_string_object
((
acpi_size
)
(
string_length
-
1
));
if
(
!
return_desc
)
{
return_ACPI_STATUS
(
AE_NO_MEMORY
);
}
...
...
drivers/acpi/executer/excreate.c
View file @
fd350943
...
...
@@ -50,7 +50,6 @@
#define _COMPONENT ACPI_EXECUTER
ACPI_MODULE_NAME
(
"excreate"
)
#ifndef ACPI_NO_METHOD_EXECUTION
/*******************************************************************************
*
...
...
drivers/acpi/executer/exdump.c
View file @
fd350943
...
...
@@ -451,9 +451,8 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
ACPI_FUNCTION_NAME
(
ex_dump_operand
)
if
(
!
((
ACPI_LV_EXEC
&
acpi_dbg_level
)
&&
(
_COMPONENT
&
acpi_dbg_layer
)))
{
if
(
!
((
ACPI_LV_EXEC
&
acpi_dbg_level
)
&&
(
_COMPONENT
&
acpi_dbg_layer
)))
{
return
;
}
...
...
@@ -844,9 +843,8 @@ void acpi_ex_dump_namespace_node(struct acpi_namespace_node *node, u32 flags)
ACPI_FUNCTION_ENTRY
();
if
(
!
flags
)
{
if
(
!
((
ACPI_LV_OBJECTS
&
acpi_dbg_level
)
&&
(
_COMPONENT
&
acpi_dbg_layer
)))
{
if
(
!
((
ACPI_LV_OBJECTS
&
acpi_dbg_level
)
&&
(
_COMPONENT
&
acpi_dbg_layer
)))
{
return
;
}
}
...
...
@@ -1011,9 +1009,8 @@ acpi_ex_dump_object_descriptor(union acpi_operand_object *obj_desc, u32 flags)
}
if
(
!
flags
)
{
if
(
!
((
ACPI_LV_OBJECTS
&
acpi_dbg_level
)
&&
(
_COMPONENT
&
acpi_dbg_layer
)))
{
if
(
!
((
ACPI_LV_OBJECTS
&
acpi_dbg_level
)
&&
(
_COMPONENT
&
acpi_dbg_layer
)))
{
return_VOID
;
}
}
...
...
drivers/acpi/executer/exmutex.c
View file @
fd350943
...
...
@@ -273,7 +273,8 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
"Thread %lX cannot release Mutex [%4.4s] acquired by thread %lX"
,
(
unsigned
long
)
walk_state
->
thread
->
thread_id
,
acpi_ut_get_node_name
(
obj_desc
->
mutex
.
node
),
(
unsigned
long
)
obj_desc
->
mutex
.
owner_thread
->
thread_id
));
(
unsigned
long
)
obj_desc
->
mutex
.
owner_thread
->
thread_id
));
return_ACPI_STATUS
(
AE_AML_NOT_OWNER
);
}
...
...
drivers/acpi/executer/exnames.c
View file @
fd350943
...
...
@@ -177,8 +177,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
ACPI_DEBUG_PRINT
((
ACPI_DB_LOAD
,
"Bytes from stream:
\n
"
));
for
(
index
=
0
;
(
index
<
ACPI_NAME_SIZE
)
for
(
index
=
0
;
(
index
<
ACPI_NAME_SIZE
)
&&
(
acpi_ut_valid_acpi_char
(
*
aml_address
,
0
));
index
++
)
{
char_buf
[
index
]
=
*
aml_address
++
;
ACPI_DEBUG_PRINT
((
ACPI_DB_LOAD
,
"%c
\n
"
,
char_buf
[
index
]));
...
...
drivers/acpi/executer/exprep.c
View file @
fd350943
...
...
@@ -242,7 +242,7 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc,
obj_desc
->
common_field
.
bit_length
,
0xFFFFFFFF
/* Temp until we pass region_length as parameter */
);
);
bit_length
=
byte_alignment
*
8
;
#endif
...
...
drivers/acpi/executer/exresop.c
View file @
fd350943
...
...
@@ -354,8 +354,7 @@ acpi_ex_resolve_operands(u16 opcode,
if
((
opcode
==
AML_STORE_OP
)
&&
(
ACPI_GET_OBJECT_TYPE
(
*
stack_ptr
)
==
ACPI_TYPE_LOCAL_REFERENCE
)
&&
((
*
stack_ptr
)
->
reference
.
opcode
==
AML_INDEX_OP
))
{
&&
((
*
stack_ptr
)
->
reference
.
opcode
==
AML_INDEX_OP
))
{
goto
next_operand
;
}
break
;
...
...
drivers/acpi/hardware/hwsleep.c
View file @
fd350943
...
...
@@ -152,7 +152,6 @@ acpi_get_firmware_waking_vector(acpi_physical_address * physical_address)
ACPI_EXPORT_SYMBOL
(
acpi_get_firmware_waking_vector
)
#endif
/*******************************************************************************
*
* FUNCTION: acpi_enter_sleep_state_prep
...
...
drivers/acpi/namespace/nseval.c
View file @
fd350943
...
...
@@ -75,7 +75,7 @@ ACPI_MODULE_NAME("nseval")
* MUTEX: Locks interpreter
*
******************************************************************************/
acpi_status
acpi_ns_evaluate
(
struct
acpi_evaluate_info
*
info
)
acpi_status
acpi_ns_evaluate
(
struct
acpi_evaluate_info
*
info
)
{
acpi_status
status
;
...
...
drivers/acpi/namespace/nswalk.c
View file @
fd350943
...
...
@@ -65,10 +65,8 @@ ACPI_MODULE_NAME("nswalk")
* within Scope is returned.
*
******************************************************************************/
struct
acpi_namespace_node
*
acpi_ns_get_next_node
(
acpi_object_type
type
,
struct
acpi_namespace_node
*
parent_node
,
struct
acpi_namespace_node
struct
acpi_namespace_node
*
acpi_ns_get_next_node
(
acpi_object_type
type
,
struct
acpi_namespace_node
*
parent_node
,
struct
acpi_namespace_node
*
child_node
)
{
struct
acpi_namespace_node
*
next_node
=
NULL
;
...
...
drivers/acpi/namespace/nsxfeval.c
View file @
fd350943
...
...
@@ -48,7 +48,6 @@
#define _COMPONENT ACPI_NAMESPACE
ACPI_MODULE_NAME
(
"nsxfeval"
)
#ifdef ACPI_FUTURE_USAGE
/*******************************************************************************
*
...
...
@@ -73,8 +72,8 @@ ACPI_MODULE_NAME("nsxfeval")
acpi_status
acpi_evaluate_object_typed
(
acpi_handle
handle
,
acpi_string
pathname
,
struct
acpi_object_list
*
external_params
,
struct
acpi_buffer
*
return_buffer
,
struct
acpi_object_list
*
external_params
,
struct
acpi_buffer
*
return_buffer
,
acpi_object_type
return_type
)
{
acpi_status
status
;
...
...
@@ -143,7 +142,6 @@ acpi_evaluate_object_typed(acpi_handle handle,
ACPI_EXPORT_SYMBOL
(
acpi_evaluate_object_typed
)
#endif
/* ACPI_FUTURE_USAGE */
/*******************************************************************************
*
* FUNCTION: acpi_evaluate_object
...
...
drivers/acpi/parser/psopcode.c
View file @
fd350943
This diff is collapsed.
Click to expand it.
drivers/acpi/resources/rscalc.c
View file @
fd350943
...
...
@@ -567,7 +567,8 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object,
(
*
sub_object_list
)
->
string
.
length
+
1
);
}
else
{
temp_size_needed
+=
acpi_ns_get_pathname_length
((
*
sub_object_list
)
->
reference
.
node
);
temp_size_needed
+=
acpi_ns_get_pathname_length
((
*
sub_object_list
)
->
reference
.
node
);
}
}
else
{
/*
...
...
drivers/acpi/resources/rscreate.c
View file @
fd350943
...
...
@@ -267,16 +267,19 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
* If BIOS erroneously reversed the _PRT source_name and source_index,
* then reverse them back.
*/
if
(
ACPI_GET_OBJECT_TYPE
(
sub_object_list
[
3
])
!=
ACPI_TYPE_INTEGER
)
{
if
(
ACPI_GET_OBJECT_TYPE
(
sub_object_list
[
3
])
!=
ACPI_TYPE_INTEGER
)
{
if
(
acpi_gbl_enable_interpreter_slack
)
{
source_name_index
=
3
;
source_index_index
=
2
;
printk
(
KERN_WARNING
"ACPI: Handling Garbled _PRT entry
\n
"
);
printk
(
KERN_WARNING
"ACPI: Handling Garbled _PRT entry
\n
"
);
}
else
{
ACPI_ERROR
((
AE_INFO
,
"(PRT[%X].source_index) Need Integer, found %s"
,
index
,
acpi_ut_get_object_type_name
(
sub_object_list
[
3
])));
"(PRT[%X].source_index) Need Integer, found %s"
,
index
,
acpi_ut_get_object_type_name
(
sub_object_list
[
3
])));
return_ACPI_STATUS
(
AE_BAD_DATA
);
}
}
...
...
drivers/acpi/resources/rsdump.c
View file @
fd350943
...
...
@@ -46,7 +46,6 @@
#define _COMPONENT ACPI_RESOURCES
ACPI_MODULE_NAME
(
"rsdump"
)
#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
/* Local prototypes */
static
void
acpi_rs_out_string
(
char
*
title
,
char
*
value
);
...
...
@@ -489,10 +488,9 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table)
/*
* Optional resource_source for Address resources
*/
acpi_rs_dump_resource_source
(
ACPI_CAST_PTR
(
struct
acpi_resource_source
,
target
));
acpi_rs_dump_resource_source
(
ACPI_CAST_PTR
(
struct
acpi_resource_source
,
target
));
break
;
default:
...
...
drivers/acpi/resources/rsinfo.c
View file @
fd350943
...
...
@@ -142,7 +142,7 @@ struct acpi_rsdump_info *acpi_gbl_dump_resource_dispatch[] = {
};
#endif
#endif
/* ACPI_FUTURE_USAGE */
#endif
/* ACPI_FUTURE_USAGE */
/*
* Base sizes for external AML resource descriptors, indexed by internal type.
* Includes size of the descriptor header (1 byte for small descriptors,
...
...
drivers/acpi/resources/rslist.c
View file @
fd350943
...
...
@@ -153,10 +153,9 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,
/* Perform the conversion */
status
=
acpi_rs_convert_resource_to_aml
(
resource
,
ACPI_CAST_PTR
(
union
aml_resource
,
aml
),
status
=
acpi_rs_convert_resource_to_aml
(
resource
,
ACPI_CAST_PTR
(
union
aml_resource
,
aml
),
acpi_gbl_set_resource_dispatch
[
resource
->
type
]);
if
(
ACPI_FAILURE
(
status
))
{
...
...
drivers/acpi/resources/rsmisc.c
View file @
fd350943
...
...
@@ -46,7 +46,6 @@
#define _COMPONENT ACPI_RESOURCES
ACPI_MODULE_NAME
(
"rsmisc"
)
#define INIT_RESOURCE_TYPE(i) i->resource_offset
#define INIT_RESOURCE_LENGTH(i) i->aml_offset
#define INIT_TABLE_LENGTH(i) i->value
...
...
@@ -429,8 +428,7 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
* Optional resource_source (Index and String)
*/
aml_length
=
acpi_rs_set_resource_source
(
aml
,
(
acpi_rs_length
)
acpi_rs_set_resource_source
(
aml
,
(
acpi_rs_length
)
aml_length
,
source
);
acpi_rs_set_resource_length
(
aml_length
,
aml
);
break
;
...
...
drivers/acpi/resources/rsutils.c
View file @
fd350943
...
...
@@ -353,10 +353,8 @@ acpi_rs_get_resource_source(acpi_rs_length resource_length,
*
* Zero the entire area of the buffer.
*/
total_length
=
(
u32
)
ACPI_STRLEN
(
ACPI_CAST_PTR
(
char
,
&
aml_resource_source
[
1
]))
+
1
;
total_length
=
(
u32
)
ACPI_STRLEN
(
ACPI_CAST_PTR
(
char
,
&
aml_resource_source
[
1
]))
+
1
;
total_length
=
(
u32
)
ACPI_ROUND_UP_TO_NATIVE_WORD
(
total_length
);
ACPI_MEMSET
(
resource_source
->
string_ptr
,
0
,
total_length
);
...
...
drivers/acpi/resources/rsxface.c
View file @
fd350943
...
...
@@ -217,7 +217,6 @@ acpi_get_current_resources(acpi_handle device_handle,
}
ACPI_EXPORT_SYMBOL
(
acpi_get_current_resources
)
#ifdef ACPI_FUTURE_USAGE
/*******************************************************************************
*
...
...
@@ -261,7 +260,6 @@ acpi_get_possible_resources(acpi_handle device_handle,
ACPI_EXPORT_SYMBOL
(
acpi_get_possible_resources
)
#endif
/* ACPI_FUTURE_USAGE */
/*******************************************************************************
*
* FUNCTION: acpi_set_current_resources
...
...
@@ -496,7 +494,6 @@ ACPI_EXPORT_SYMBOL(acpi_rs_match_vendor_resource)
* each resource in the list.
*
******************************************************************************/
acpi_status
acpi_walk_resources
(
acpi_handle
device_handle
,
char
*
name
,
...
...
drivers/acpi/sleep/main.c
View file @
fd350943
...
...
@@ -222,7 +222,7 @@ static struct hibernation_ops acpi_hibernation_ops = {
.
enter
=
acpi_hibernation_enter
,
.
finish
=
acpi_hibernation_finish
,
};
#endif
/* CONFIG_SOFTWARE_SUSPEND */
#endif
/* CONFIG_SOFTWARE_SUSPEND */
/*
* Toshiba fails to preserve interrupts over S1, reinitialization
...
...
@@ -276,4 +276,3 @@ int __init acpi_sleep_init(void)
return
0
;
}
drivers/acpi/sleep/proc.c
View file @
fd350943
...
...
@@ -349,8 +349,7 @@ acpi_system_write_alarm(struct file *file,
end:
return_VALUE
(
result
?
result
:
count
);
}
#endif
/* HAVE_ACPI_LEGACY_ALARM */
#endif
/* HAVE_ACPI_LEGACY_ALARM */
extern
struct
list_head
acpi_wakeup_device_list
;
extern
spinlock_t
acpi_device_lock
;
...
...
@@ -380,8 +379,8 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
dev
->
wakeup
.
state
.
enabled
?
"enabled"
:
"disabled"
);
if
(
ldev
)
seq_printf
(
seq
,
"%s:%s"
,
ldev
->
bus
?
ldev
->
bus
->
name
:
"no-bus"
,
ldev
->
bus_id
);
ldev
->
bus
?
ldev
->
bus
->
name
:
"no-bus"
,
ldev
->
bus_id
);
seq_printf
(
seq
,
"
\n
"
);
put_device
(
ldev
);
...
...
@@ -490,7 +489,7 @@ static u32 rtc_handler(void *context)
return
ACPI_INTERRUPT_HANDLED
;
}
#endif
/* HAVE_ACPI_LEGACY_ALARM */
#endif
/* HAVE_ACPI_LEGACY_ALARM */
static
int
__init
acpi_sleep_proc_init
(
void
)
{
...
...
@@ -517,7 +516,7 @@ static int __init acpi_sleep_proc_init(void)
entry
->
proc_fops
=
&
acpi_system_alarm_fops
;
acpi_install_fixed_event_handler
(
ACPI_EVENT_RTC
,
rtc_handler
,
NULL
);
#endif
/* HAVE_ACPI_LEGACY_ALARM */
#endif
/* HAVE_ACPI_LEGACY_ALARM */
/* 'wakeup device' [R/W] */
entry
=
...
...
drivers/acpi/tables/tbfadt.c
View file @
fd350943
...
...
@@ -334,7 +334,8 @@ static void acpi_tb_convert_fadt(void)
(
acpi_gbl_FADT
.
xpm1a_event_block
.
address
+
pm1_register_length
));
/* Don't forget to copy space_id of the GAS */
acpi_gbl_xpm1a_enable
.
space_id
=
acpi_gbl_FADT
.
xpm1a_event_block
.
space_id
;
acpi_gbl_xpm1a_enable
.
space_id
=
acpi_gbl_FADT
.
xpm1a_event_block
.
space_id
;
/* The PM1B register block is optional, ignore if not present */
...
...
@@ -344,7 +345,8 @@ static void acpi_tb_convert_fadt(void)
(
acpi_gbl_FADT
.
xpm1b_event_block
.
address
+
pm1_register_length
));
/* Don't forget to copy space_id of the GAS */
acpi_gbl_xpm1b_enable
.
space_id
=
acpi_gbl_FADT
.
xpm1a_event_block
.
space_id
;
acpi_gbl_xpm1b_enable
.
space_id
=
acpi_gbl_FADT
.
xpm1a_event_block
.
space_id
;
}
...
...
drivers/acpi/tables/tbxface.c
View file @
fd350943
...
...
@@ -201,6 +201,7 @@ acpi_status acpi_reallocate_root_table(void)
return_ACPI_STATUS
(
AE_OK
);
}
/*******************************************************************************
*
* FUNCTION: acpi_load_table
...
...
@@ -262,7 +263,7 @@ ACPI_EXPORT_SYMBOL(acpi_load_table)
acpi_status
acpi_get_table_header
(
char
*
signature
,
acpi_native_uint
instance
,
struct
acpi_table_header
*
out_table_header
)
struct
acpi_table_header
*
out_table_header
)
{
acpi_native_uint
i
;
acpi_native_uint
j
;
...
...
@@ -321,7 +322,6 @@ acpi_get_table_header(char *signature,
ACPI_EXPORT_SYMBOL
(
acpi_get_table_header
)
/******************************************************************************
*
* FUNCTION: acpi_unload_table_id
...
...
@@ -346,11 +346,11 @@ acpi_status acpi_unload_table_id(acpi_owner_id id)
continue
;
}
/*
* Delete all namespace objects owned by this table. Note that these
* objects can appear anywhere in the namespace by virtue of the AML
* "Scope" operator. Thus, we need to track ownership by an ID, not
* simply a position within the hierarchy
*/
* Delete all namespace objects owned by this table. Note that these
* objects can appear anywhere in the namespace by virtue of the AML
* "Scope" operator. Thus, we need to track ownership by an ID, not
* simply a position within the hierarchy
*/
acpi_tb_delete_namespace_by_owner
(
i
);
status
=
acpi_tb_release_owner_id
(
i
);
acpi_tb_set_table_loaded_flag
(
i
,
FALSE
);
...
...
@@ -376,7 +376,7 @@ ACPI_EXPORT_SYMBOL(acpi_unload_table_id)
*****************************************************************************/
acpi_status
acpi_get_table
(
char
*
signature
,
acpi_native_uint
instance
,
struct
acpi_table_header
**
out_table
)
acpi_native_uint
instance
,
struct
acpi_table_header
**
out_table
)
{
acpi_native_uint
i
;
acpi_native_uint
j
;
...
...
drivers/acpi/utilities/utalloc.c
View file @
fd350943
...
...
@@ -107,7 +107,6 @@ acpi_status acpi_ut_create_caches(void)
if
(
ACPI_FAILURE
(
status
))
{
return
(
status
);
}
#ifdef ACPI_DBG_TRACK_ALLOCATIONS
/* Memory allocation lists */
...
...
drivers/acpi/utilities/utcache.c
View file @
fd350943
...
...
@@ -45,7 +45,6 @@
#define _COMPONENT ACPI_UTILITIES
ACPI_MODULE_NAME
(
"utcache"
)
#ifdef ACPI_USE_LOCAL_CACHE
/*******************************************************************************
*
...
...
@@ -64,7 +63,7 @@ ACPI_MODULE_NAME("utcache")
acpi_status
acpi_os_create_cache
(
char
*
cache_name
,
u16
object_size
,
u16
max_depth
,
struct
acpi_memory_list
**
return_cache
)
u16
max_depth
,
struct
acpi_memory_list
**
return_cache
)
{
struct
acpi_memory_list
*
cache
;
...
...
drivers/acpi/utilities/utcopy.c
View file @
fd350943
...
...
@@ -814,7 +814,9 @@ acpi_ut_copy_ielement_to_ielement(u8 object_type,
/*
* Create the object array
*/
target_object
->
package
.
elements
=
ACPI_ALLOCATE_ZEROED
(((
acpi_size
)
source_object
->
package
.
count
+
1
)
*
sizeof
(
void
*
));
target_object
->
package
.
elements
=
ACPI_ALLOCATE_ZEROED
(((
acpi_size
)
source_object
->
package
.
count
+
1
)
*
sizeof
(
void
*
));
if
(
!
target_object
->
package
.
elements
)
{
status
=
AE_NO_MEMORY
;
goto
error_exit
;
...
...
drivers/acpi/utilities/utdebug.c
View file @
fd350943
...
...
@@ -45,7 +45,6 @@
#define _COMPONENT ACPI_UTILITIES
ACPI_MODULE_NAME
(
"utdebug"
)
#ifdef ACPI_DEBUG_OUTPUT
static
acpi_thread_id
acpi_gbl_prev_thread_id
;
static
char
*
acpi_gbl_fn_entry_str
=
"----Entry"
;
...
...
@@ -181,7 +180,8 @@ acpi_ut_debug_print(u32 requested_debug_level,
if
(
ACPI_LV_THREADS
&
acpi_dbg_level
)
{
acpi_os_printf
(
"
\n
**** Context Switch from TID %lX to TID %lX ****
\n\n
"
,
(
unsigned
long
)
acpi_gbl_prev_thread_id
,
(
unsigned
long
)
thread_id
);
(
unsigned
long
)
acpi_gbl_prev_thread_id
,
(
unsigned
long
)
thread_id
);
}
acpi_gbl_prev_thread_id
=
thread_id
;
...
...
drivers/acpi/utilities/utglobal.c
View file @
fd350943
...
...
@@ -55,12 +55,10 @@ ACPI_EXPORT_SYMBOL(acpi_gbl_FADT)
* Static global variable initialization.
*
******************************************************************************/
/*
* We want the debug switches statically initialized so they
* are already set when the debugger is entered.
*/
/* Debug switch - level and trace mask */
u32
acpi_dbg_level
=
ACPI_DEBUG_DEFAULT
;
...
...
@@ -735,5 +733,5 @@ void acpi_ut_init_globals(void)
}
ACPI_EXPORT_SYMBOL
(
acpi_dbg_level
)
ACPI_EXPORT_SYMBOL
(
acpi_dbg_layer
)
ACPI_EXPORT_SYMBOL
(
acpi_gpe_count
)
ACPI_EXPORT_SYMBOL
(
acpi_dbg_layer
)
ACPI_EXPORT_SYMBOL
(
acpi_gpe_count
)
drivers/acpi/utilities/utmisc.c
View file @
fd350943
...
...
@@ -802,9 +802,8 @@ acpi_ut_strtoul64(char *string, u32 base, acpi_integer * ret_integer)
valid_digits
++
;
if
(
sign_of0x
&&
((
valid_digits
>
16
)
||
((
valid_digits
>
8
)
&&
mode32
)))
{
if
(
sign_of0x
&&
((
valid_digits
>
16
)
||
((
valid_digits
>
8
)
&&
mode32
)))
{
/*
* This is to_integer operation case.
* No any restrictions for string-to-integer conversion,
...
...
@@ -1049,6 +1048,7 @@ acpi_ut_exception(char *module_name,
acpi_os_vprintf
(
format
,
args
);
acpi_os_printf
(
" [%X]
\n
"
,
ACPI_CA_VERSION
);
}
EXPORT_SYMBOL
(
acpi_ut_exception
);
void
ACPI_INTERNAL_VAR_XFACE
...
...
drivers/acpi/utilities/utmutex.c
View file @
fd350943
...
...
@@ -244,7 +244,7 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
ACPI_DEBUG_PRINT
((
ACPI_DB_MUTEX
,
"Thread %lX attempting to acquire Mutex [%s]
\n
"
,
(
unsigned
long
)
this_thread_id
,
(
unsigned
long
)
this_thread_id
,
acpi_ut_get_mutex_name
(
mutex_id
)));
status
=
acpi_os_acquire_mutex
(
acpi_gbl_mutex_info
[
mutex_id
].
mutex
,
...
...
@@ -252,7 +252,7 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
if
(
ACPI_SUCCESS
(
status
))
{
ACPI_DEBUG_PRINT
((
ACPI_DB_MUTEX
,
"Thread %lX acquired Mutex [%s]
\n
"
,
(
unsigned
long
)
this_thread_id
,
(
unsigned
long
)
this_thread_id
,
acpi_ut_get_mutex_name
(
mutex_id
)));
acpi_gbl_mutex_info
[
mutex_id
].
use_count
++
;
...
...
@@ -260,7 +260,7 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
}
else
{
ACPI_EXCEPTION
((
AE_INFO
,
status
,
"Thread %lX could not acquire Mutex [%X]"
,
(
unsigned
long
)
this_thread_id
,
mutex_id
));
(
unsigned
long
)
this_thread_id
,
mutex_id
));
}
return
(
status
);
...
...
@@ -287,7 +287,7 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
this_thread_id
=
acpi_os_get_thread_id
();
ACPI_DEBUG_PRINT
((
ACPI_DB_MUTEX
,
"Thread %lX releasing Mutex [%s]
\n
"
,
(
unsigned
long
)
this_thread_id
,
(
unsigned
long
)
this_thread_id
,
acpi_ut_get_mutex_name
(
mutex_id
)));
if
(
mutex_id
>
ACPI_MAX_MUTEX
)
{
...
...
drivers/acpi/utilities/utresrc.c
View file @
fd350943
...
...
@@ -46,7 +46,6 @@
#define _COMPONENT ACPI_UTILITIES
ACPI_MODULE_NAME
(
"utresrc"
)
#if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER)
/*
* Strings used to decode resource descriptors.
...
...
drivers/acpi/utilities/utxface.c
View file @
fd350943
...
...
@@ -337,7 +337,6 @@ acpi_status acpi_terminate(void)
}
ACPI_EXPORT_SYMBOL
(
acpi_terminate
)
#ifdef ACPI_FUTURE_USAGE
/*******************************************************************************
*
...
...
@@ -470,7 +469,6 @@ acpi_install_initialization_handler(acpi_init_handler handler, u32 function)
ACPI_EXPORT_SYMBOL
(
acpi_install_initialization_handler
)
#endif
/* ACPI_FUTURE_USAGE */
/*****************************************************************************
*
* FUNCTION: acpi_purge_cached_objects
...
...
include/acpi/acdispat.h
View file @
fd350943
...
...
@@ -290,12 +290,9 @@ acpi_ds_obj_stack_push(void *object, struct acpi_walk_state *walk_state);
acpi_status
acpi_ds_obj_stack_pop
(
u32
pop_count
,
struct
acpi_walk_state
*
walk_state
);
struct
acpi_walk_state
*
acpi_ds_create_walk_state
(
acpi_owner_id
owner_id
,
union
acpi_parse_object
*
origin
,
union
acpi_operand_object
*
mth_desc
,
struct
acpi_thread_state
struct
acpi_walk_state
*
acpi_ds_create_walk_state
(
acpi_owner_id
owner_id
,
union
acpi_parse_object
*
origin
,
union
acpi_operand_object
*
mth_desc
,
struct
acpi_thread_state
*
thread
);
acpi_status
...
...
include/acpi/acglobal.h
View file @
fd350943
...
...
@@ -319,7 +319,7 @@ ACPI_EXTERN struct acpi_fixed_event_handler
acpi_gbl_fixed_event_handlers
[
ACPI_NUM_FIXED_EVENTS
];
ACPI_EXTERN
struct
acpi_gpe_xrupt_info
*
acpi_gbl_gpe_xrupt_list_head
;
ACPI_EXTERN
struct
acpi_gpe_block_info
*
acpi_gbl_gpe_fadt_blocks
[
ACPI_MAX_GPE_BLOCKS
];
*
acpi_gbl_gpe_fadt_blocks
[
ACPI_MAX_GPE_BLOCKS
];
/*****************************************************************************
*
...
...
include/acpi/aclocal.h
View file @
fd350943
...
...
@@ -630,7 +630,7 @@ ACPI_PARSE_COMMON};
* and bytelists.
*/
struct
acpi_parse_obj_named
{
ACPI_PARSE_COMMON
u8
*
path
;
ACPI_PARSE_COMMON
u8
*
path
;
u8
*
data
;
/* AML body or bytelist data */
u32
length
;
/* AML length */
u32
name
;
/* 4-byte name or zero if no name */
...
...
include/acpi/acnamesp.h
View file @
fd350943
...
...
@@ -100,10 +100,8 @@ acpi_ns_walk_namespace(acpi_object_type type,
acpi_walk_callback
user_function
,
void
*
context
,
void
**
return_value
);
struct
acpi_namespace_node
*
acpi_ns_get_next_node
(
acpi_object_type
type
,
struct
acpi_namespace_node
*
parent
,
struct
acpi_namespace_node
struct
acpi_namespace_node
*
acpi_ns_get_next_node
(
acpi_object_type
type
,
struct
acpi_namespace_node
*
parent
,
struct
acpi_namespace_node
*
child
);
/*
...
...
include/acpi/acobject.h
View file @
fd350943
...
...
@@ -216,7 +216,7 @@ struct acpi_object_processor {
/* The next two fields take advantage of the 3-byte space before NOTIFY_INFO */
u8
proc_id
;
u8
length
;
ACPI_COMMON_NOTIFY_INFO
acpi_io_address
address
;
ACPI_COMMON_NOTIFY_INFO
acpi_io_address
address
;
};
struct
acpi_object_thermal_zone
{
...
...
include/acpi/acpi_bus.h
View file @
fd350943
...
...
@@ -91,7 +91,8 @@ typedef int (*acpi_op_remove) (struct acpi_device * device, int type);
typedef
int
(
*
acpi_op_lock
)
(
struct
acpi_device
*
device
,
int
type
);
typedef
int
(
*
acpi_op_start
)
(
struct
acpi_device
*
device
);
typedef
int
(
*
acpi_op_stop
)
(
struct
acpi_device
*
device
,
int
type
);
typedef
int
(
*
acpi_op_suspend
)
(
struct
acpi_device
*
device
,
pm_message_t
state
);
typedef
int
(
*
acpi_op_suspend
)
(
struct
acpi_device
*
device
,
pm_message_t
state
);
typedef
int
(
*
acpi_op_resume
)
(
struct
acpi_device
*
device
);
typedef
int
(
*
acpi_op_scan
)
(
struct
acpi_device
*
device
);
typedef
int
(
*
acpi_op_bind
)
(
struct
acpi_device
*
device
);
...
...
@@ -296,7 +297,7 @@ struct acpi_device {
void
*
driver_data
;
struct
device
dev
;
struct
acpi_bus_ops
bus_ops
;
/* workaround for different code path for hotplug */
enum
acpi_bus_removal_type
removal_type
;
/* indicate for different removal type */
enum
acpi_bus_removal_type
removal_type
;
/* indicate for different removal type */
};
#define acpi_driver_data(d) ((d)->driver_data)
...
...
@@ -338,7 +339,7 @@ int acpi_bus_add(struct acpi_device **child, struct acpi_device *parent,
acpi_handle
handle
,
int
type
);
int
acpi_bus_trim
(
struct
acpi_device
*
start
,
int
rmdevice
);
int
acpi_bus_start
(
struct
acpi_device
*
device
);
acpi_status
acpi_bus_get_ejd
(
acpi_handle
handle
,
acpi_handle
*
ejd
);
acpi_status
acpi_bus_get_ejd
(
acpi_handle
handle
,
acpi_handle
*
ejd
);
int
acpi_match_ids
(
struct
acpi_device
*
device
,
char
*
ids
);
int
acpi_create_dir
(
struct
acpi_device
*
);
void
acpi_remove_dir
(
struct
acpi_device
*
);
...
...
@@ -363,6 +364,6 @@ acpi_handle acpi_get_child(acpi_handle, acpi_integer);
acpi_handle
acpi_get_pci_rootbridge_handle
(
unsigned
int
,
unsigned
int
);
#define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle))
#endif
/* CONFIG_ACPI */
#endif
/* CONFIG_ACPI */
#endif
/*__ACPI_BUS_H__*/
include/acpi/acpi_drivers.h
View file @
fd350943
...
...
@@ -113,7 +113,8 @@ extern int is_dock_device(acpi_handle handle);
extern
int
register_dock_notifier
(
struct
notifier_block
*
nb
);
extern
void
unregister_dock_notifier
(
struct
notifier_block
*
nb
);
extern
int
register_hotplug_dock_device
(
acpi_handle
handle
,
acpi_notify_handler
handler
,
void
*
context
);
acpi_notify_handler
handler
,
void
*
context
);
extern
void
unregister_hotplug_dock_device
(
acpi_handle
handle
);
#else
static
inline
int
is_dock_device
(
acpi_handle
handle
)
...
...
@@ -128,7 +129,8 @@ static inline void unregister_dock_notifier(struct notifier_block *nb)
{
}
static
inline
int
register_hotplug_dock_device
(
acpi_handle
handle
,
acpi_notify_handler
handler
,
void
*
context
)
acpi_notify_handler
handler
,
void
*
context
)
{
return
-
ENODEV
;
}
...
...
include/acpi/acpi_numa.h
View file @
fd350943
...
...
@@ -8,7 +8,7 @@
#if MAX_NUMNODES > 256
#define MAX_PXM_DOMAINS MAX_NUMNODES
#else
#define MAX_PXM_DOMAINS (256)
/* Old pxm spec is defined 8 bit */
#define MAX_PXM_DOMAINS (256)
/* Old pxm spec is defined 8 bit */
#endif
extern
int
__cpuinitdata
pxm_to_node_map
[
MAX_PXM_DOMAINS
];
...
...
include/acpi/acpiosxf.h
View file @
fd350943
...
...
@@ -143,7 +143,8 @@ void acpi_os_release_mutex(acpi_mutex handle);
*/
void
*
acpi_os_allocate
(
acpi_size
size
);
void
__iomem
*
acpi_os_map_memory
(
acpi_physical_address
where
,
acpi_native_uint
length
);
void
__iomem
*
acpi_os_map_memory
(
acpi_physical_address
where
,
acpi_native_uint
length
);
void
acpi_os_unmap_memory
(
void
__iomem
*
logical_address
,
acpi_size
size
);
...
...
include/acpi/actypes.h
View file @
fd350943
...
...
@@ -344,7 +344,7 @@ typedef u32 acpi_integer;
/* 64-bit integers */
typedef
unsigned
long
long
acpi_integer
;
typedef
unsigned
long
long
acpi_integer
;
#define ACPI_INTEGER_MAX ACPI_UINT64_MAX
#define ACPI_INTEGER_BIT_SIZE 64
#define ACPI_MAX_DECIMAL_DIGITS 20
/* 2^64 = 18,446,744,073,709,551,616 */
...
...
include/acpi/acutils.h
View file @
fd350943
...
...
@@ -498,7 +498,8 @@ acpi_ut_display_init_pathname(u8 type,
acpi_status
acpi_ut_walk_aml_resources
(
u8
*
aml
,
acpi_size
aml_length
,
acpi_walk_aml_callback
user_function
,
void
**
context
);
acpi_walk_aml_callback
user_function
,
void
**
context
);
acpi_status
acpi_ut_validate_resource
(
void
*
aml
,
u8
*
return_index
);
...
...
include/acpi/platform/aclinux.h
View file @
fd350943
...
...
@@ -103,7 +103,10 @@
#define acpi_thread_id struct task_struct *
static
inline
acpi_thread_id
acpi_os_get_thread_id
(
void
)
{
return
current
;
}
static
inline
acpi_thread_id
acpi_os_get_thread_id
(
void
)
{
return
current
;
}
/*
* The irqs_disabled() check is for resume from RAM.
...
...
@@ -112,15 +115,19 @@ static inline acpi_thread_id acpi_os_get_thread_id(void) { return current; }
* to quiet __might_sleep() in kmalloc() and resume does not.
*/
#include <acpi/actypes.h>
static
inline
void
*
acpi_os_allocate
(
acpi_size
size
)
{
return
kmalloc
(
size
,
irqs_disabled
()
?
GFP_ATOMIC
:
GFP_KERNEL
);
static
inline
void
*
acpi_os_allocate
(
acpi_size
size
)
{
return
kmalloc
(
size
,
irqs_disabled
()
?
GFP_ATOMIC
:
GFP_KERNEL
);
}
static
inline
void
*
acpi_os_allocate_zeroed
(
acpi_size
size
)
{
return
kzalloc
(
size
,
irqs_disabled
()
?
GFP_ATOMIC
:
GFP_KERNEL
);
static
inline
void
*
acpi_os_allocate_zeroed
(
acpi_size
size
)
{
return
kzalloc
(
size
,
irqs_disabled
()
?
GFP_ATOMIC
:
GFP_KERNEL
);
}
static
inline
void
*
acpi_os_acquire_object
(
acpi_cache_t
*
cache
)
{
return
kmem_cache_zalloc
(
cache
,
irqs_disabled
()
?
GFP_ATOMIC
:
GFP_KERNEL
);
static
inline
void
*
acpi_os_acquire_object
(
acpi_cache_t
*
cache
)
{
return
kmem_cache_zalloc
(
cache
,
irqs_disabled
()
?
GFP_ATOMIC
:
GFP_KERNEL
);
}
#define ACPI_ALLOCATE(a) acpi_os_allocate(a)
...
...
include/acpi/processor.h
View file @
fd350943
...
...
@@ -18,7 +18,7 @@
#define ACPI_PDC_REVISION_ID 0x1
#define ACPI_PSD_REV0_REVISION 0
/* Support for _PSD as in ACPI 3.0 */
#define ACPI_PSD_REV0_REVISION 0
/* Support for _PSD as in ACPI 3.0 */
#define ACPI_PSD_REV0_ENTRIES 5
/*
...
...
@@ -189,8 +189,9 @@ struct acpi_processor_errata {
}
piix4
;
};
extern
int
acpi_processor_preregister_performance
(
struct
acpi_processor_performance
**
performance
);
extern
int
acpi_processor_preregister_performance
(
struct
acpi_processor_performance
**
performance
);
extern
int
acpi_processor_register_performance
(
struct
acpi_processor_performance
*
performance
,
unsigned
int
cpu
);
...
...
@@ -213,7 +214,8 @@ void arch_acpi_processor_init_pdc(struct acpi_processor *pr);
void
acpi_processor_power_init_bm_check
(
struct
acpi_processor_flags
*
flags
,
unsigned
int
cpu
);
int
acpi_processor_ffh_cstate_probe
(
unsigned
int
cpu
,
struct
acpi_processor_cx
*
cx
,
struct
acpi_power_register
*
reg
);
struct
acpi_processor_cx
*
cx
,
struct
acpi_power_register
*
reg
);
void
acpi_processor_ffh_cstate_enter
(
struct
acpi_processor_cx
*
cstate
);
#else
static
inline
void
acpi_processor_power_init_bm_check
(
struct
...
...
@@ -224,12 +226,14 @@ static inline void acpi_processor_power_init_bm_check(struct
return
;
}
static
inline
int
acpi_processor_ffh_cstate_probe
(
unsigned
int
cpu
,
struct
acpi_processor_cx
*
cx
,
struct
acpi_power_register
*
reg
)
struct
acpi_processor_cx
*
cx
,
struct
acpi_power_register
*
reg
)
{
return
-
1
;
}
static
inline
void
acpi_processor_ffh_cstate_enter
(
struct
acpi_processor_cx
*
cstate
)
static
inline
void
acpi_processor_ffh_cstate_enter
(
struct
acpi_processor_cx
*
cstate
)
{
return
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment