projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
[firefly-linux-kernel-4.4.55.git]
/
include
/
acpi
/
processor.h
diff --git
a/include/acpi/processor.h
b/include/acpi/processor.h
index b95dc32a6e6b61aefac9fefce83c6a3da20fa111..4188a4d3b597cac7e8d929d8745217d584d0bb63 100644
(file)
--- a/
include/acpi/processor.h
+++ b/
include/acpi/processor.h
@@
-196,7
+196,7
@@
struct acpi_processor_flags {
struct acpi_processor {
acpi_handle handle;
u32 acpi_id;
struct acpi_processor {
acpi_handle handle;
u32 acpi_id;
-
u32 phys_id;
/* CPU hardware ID such as APIC ID for x86 */
+
phys_cpuid_t phys_id;
/* CPU hardware ID such as APIC ID for x86 */
u32 id; /* CPU logical ID allocated by OS */
u32 pblk;
int performance_platform_limit;
u32 id; /* CPU logical ID allocated by OS */
u32 pblk;
int performance_platform_limit;
@@
-310,8
+310,8
@@
static inline int acpi_processor_get_bios_limit(int cpu, unsigned int *limit)
#endif /* CONFIG_CPU_FREQ */
/* in processor_core.c */
#endif /* CONFIG_CPU_FREQ */
/* in processor_core.c */
-
in
t acpi_get_phys_id(acpi_handle, int type, u32 acpi_id);
-int acpi_map_cpuid(
in
t phys_id, u32 acpi_id);
+
phys_cpuid_
t acpi_get_phys_id(acpi_handle, int type, u32 acpi_id);
+int acpi_map_cpuid(
phys_cpuid_
t phys_id, u32 acpi_id);
int acpi_get_cpuid(acpi_handle, int type, u32 acpi_id);
/* in processor_pdc.c */
int acpi_get_cpuid(acpi_handle, int type, u32 acpi_id);
/* in processor_pdc.c */