diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-03-08 22:07:30 +0300 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-03-08 22:07:30 +0300 |
commit | c6380ecd8e9bee7aba3d9a5a94b58168244c4a61 (patch) | |
tree | f8d9522c66e805f638399e094f8e0dfd92584d06 /drivers/acpi/cppc_acpi.c | |
parent | cdc2466df40f26af60f6b18123069bd52336a80c (diff) | |
parent | 661e50bc853209e41a5c14a290ca4decc43cbfd1 (diff) | |
download | linux-c6380ecd8e9bee7aba3d9a5a94b58168244c4a61.tar.xz |
Merge tag 'v4.16-rc4' into next
Sync up with mainline to bring in RAVE MFD device core.
Diffstat (limited to 'drivers/acpi/cppc_acpi.c')
-rw-r--r-- | drivers/acpi/cppc_acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c index 06ea4749ebd9..0afbb2658cbc 100644 --- a/drivers/acpi/cppc_acpi.c +++ b/drivers/acpi/cppc_acpi.c @@ -119,7 +119,7 @@ static DEFINE_PER_CPU(struct cpc_desc *, cpc_desc_ptr); * to PCC commands. Keeping it high enough to cover emulators where * the processors run painfully slow. */ -#define NUM_RETRIES 500 +#define NUM_RETRIES 500ULL struct cppc_attr { struct attribute attr; |