diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-02 08:29:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-02 08:31:54 +0200 |
| commit | 3772b734720e1a3f2dc1d95cfdfaa5332f4ccf01 (patch) | |
| tree | a1a8cc85948c086aa12a1d8014151a7ca7c04ea8 /include/acpi/processor.h | |
| parent | Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/fre... (diff) | |
| parent | Linux 2.6.35 (diff) | |
| download | linux-3772b734720e1a3f2dc1d95cfdfaa5332f4ccf01.tar.xz linux-3772b734720e1a3f2dc1d95cfdfaa5332f4ccf01.zip | |
Merge commit 'v2.6.35' into perf/core
Conflicts:
tools/perf/Makefile
tools/perf/util/hist.c
Merge reason: Resolve the conflicts and update to latest upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/acpi/processor.h')
| -rw-r--r-- | include/acpi/processor.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index da565a48240e..a68ca8a11a53 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@ -48,7 +48,7 @@ struct acpi_power_register { u8 space_id; u8 bit_width; u8 bit_offset; - u8 reserved; + u8 access_size; u64 address; } __attribute__ ((packed)); @@ -63,6 +63,7 @@ struct acpi_processor_cx { u32 power; u32 usage; u64 time; + u8 bm_sts_skip; char desc[ACPI_CX_DESC_LEN]; }; |