diff options
| author | Borislav Petkov <bp@suse.de> | 2021-06-23 17:42:12 +0200 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2021-06-23 17:43:38 +0200 |
| commit | c4cf5f61982e35348f522464010445efcc0aeb60 (patch) | |
| tree | b3e65bfae5786e33ac82b30d6801983b10934a2f /include/linux/ptp_clock_kernel.h | |
| parent | b7c11876d24bdd7ae3feeaa771b8f903f6cf05eb (diff) | |
| parent | f9dfb5e390fab2df9f7944bb91e7705aba14cd26 (diff) | |
Merge x86/urgent into x86/fpu
Pick up dependent changes which either went mainline (x86/urgent is
based on -rc7 and that contains them) as urgent fixes and the current
x86/urgent branch which contains two more urgent fixes, so that the
bigger FPU rework can base off ontop.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'include/linux/ptp_clock_kernel.h')
| -rw-r--r-- | include/linux/ptp_clock_kernel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ptp_clock_kernel.h b/include/linux/ptp_clock_kernel.h index 0d47fd33b228..51d7f1b8b32a 100644 --- a/include/linux/ptp_clock_kernel.h +++ b/include/linux/ptp_clock_kernel.h @@ -235,7 +235,7 @@ extern int ptp_clock_index(struct ptp_clock *ptp); * @ppm: Parts per million, but with a 16 bit binary fractional field */ -extern s32 scaled_ppm_to_ppb(long ppm); +extern long scaled_ppm_to_ppb(long ppm); /** * ptp_find_pin() - obtain the pin index of a given auxiliary function |