There's useful stuff in <linux/timex.h> but <asm/timex.h> has nothing for userspace. Stop exporting it, and include it only from within the existing #ifdef __KERNEL__ part of <linux/timex.h> This fixes a 'make headers_check' failure on i386 because asm-i386/timex.h includes both asm-i386/tsc.h and asm-i386/processor.h, neither of which are exported to userspace. It's not entirely clear _why_ it includes either of these, but it does.
Showing the changes to include/linux (1 of 2 files). Show all
Unified · Split
| @@ -57,7 +57,6 @@ · 56 unmodified lines | |||
| 57 | #include <linux/time.h> | 57 | #include <linux/time.h> |
| 58 | 58 | ||
| 59 | #include <asm/param.h> | 59 | #include <asm/param.h> |
| 60 | #include <asm/timex.h> | ||
| 61 | 60 | ||
| 62 | /* | 61 | /* |
| 63 | * SHIFT_KG and SHIFT_KF establish the damping of the PLL and are chosen | 62 | * SHIFT_KG and SHIFT_KF establish the damping of the PLL and are chosen |
| @@ -191,6 +190,8 @@ struct timex { · 127 unmodified lines | |||
| 191 | #define TIME_BAD TIME_ERROR /* bw compat */ | 190 | #define TIME_BAD TIME_ERROR /* bw compat */ |
| 192 | 191 | ||
| 193 | #ifdef __KERNEL__ | 192 | #ifdef __KERNEL__ |
| 193 | #include <asm/timex.h> | ||
| 194 | |||
| 194 | /* | 195 | /* |
| 195 | * kernel variables | 196 | * kernel variables |
| 196 | * Note: maximum error = NTP synch distance = dispersion + delay / 2; | 197 | * Note: maximum error = NTP synch distance = dispersion + delay / 2; |