diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-10-07 07:50:20 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-10-07 07:50:20 +0100 |
| commit | af78c0b35d00dac353936ad6f8afc7f01f91c6d2 (patch) | |
| tree | ecc92aaab03a47ed5433e94f233de4413f684c46 /xen/include/acpi | |
| parent | 636eaa12d90b7151f454ec45dd47679292ece9ab (diff) | |
| download | xen-af78c0b35d00dac353936ad6f8afc7f01f91c6d2.tar.gz xen-af78c0b35d00dac353936ad6f8afc7f01f91c6d2.tar.bz2 xen-af78c0b35d00dac353936ad6f8afc7f01f91c6d2.zip | |
Scattered code arrangement cleanups.
- remove redundant declarations
- add/move prototypes to headers
- move things where they belong to
Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
Diffstat (limited to 'xen/include/acpi')
| -rw-r--r-- | xen/include/acpi/acglobal.h | 4 | ||||
| -rw-r--r-- | xen/include/acpi/platform/aclinux.h | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/xen/include/acpi/acglobal.h b/xen/include/acpi/acglobal.h index 47a1fd8f2d..feee603b0f 100644 --- a/xen/include/acpi/acglobal.h +++ b/xen/include/acpi/acglobal.h @@ -243,12 +243,16 @@ extern const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS]; /* Exception codes */ +#ifndef DEFINE_ACPI_GLOBALS + extern char const *acpi_gbl_exception_names_env[]; extern char const *acpi_gbl_exception_names_pgm[]; extern char const *acpi_gbl_exception_names_tbl[]; extern char const *acpi_gbl_exception_names_aml[]; extern char const *acpi_gbl_exception_names_ctrl[]; +#endif + /***************************************************************************** * * Namespace globals diff --git a/xen/include/acpi/platform/aclinux.h b/xen/include/acpi/platform/aclinux.h index c54dbe39c6..805d8e57d1 100644 --- a/xen/include/acpi/platform/aclinux.h +++ b/xen/include/acpi/platform/aclinux.h @@ -76,11 +76,6 @@ #define acpi_thread_id struct vcpu * -static inline acpi_thread_id acpi_os_get_thread_id(void) -{ - return current; -} - #define ACPI_ALLOCATE(a) xmalloc_bytes(a) #define ACPI_ALLOCATE_ZEROED(a) ({ \ void *p = xmalloc_bytes(a); \ |