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.
Unified · Split
| @@ -2,7 +2,7 @@ unifdef-y += a.out.h auxvec.h byteorder.h errno.h fcntl.h ioctl.h \ · 1 unmodified line | ||
| 2 | 2 | ioctls.h ipcbuf.h mman.h msgbuf.h param.h poll.h \ |
| 3 | 3 | posix_types.h ptrace.h resource.h sembuf.h shmbuf.h shmparam.h \ |
| 4 | 4 | sigcontext.h siginfo.h signal.h socket.h sockios.h stat.h \ |
| 5 | − statfs.h termbits.h termios.h timex.h types.h unistd.h user.h | |
| 5 | + statfs.h termbits.h termios.h types.h unistd.h user.h | |
| 6 | 6 | |
| 7 | 7 | # These probably shouldn't be exported |
| 8 | 8 | unifdef-y += elf.h page.h |
| @@ -57,7 +57,6 @@ · 56 unmodified lines | ||
| 57 | 57 | #include <linux/time.h> |
| 58 | 58 | |
| 59 | 59 | #include <asm/param.h> |
| 60 | −#include <asm/timex.h> | |
| 61 | 60 | |
| 62 | 61 | /* |
| 63 | 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 | 190 | #define TIME_BAD TIME_ERROR /* bw compat */ |
| 192 | 191 | |
| 193 | 192 | #ifdef __KERNEL__ |
| 193 | +#include <asm/timex.h> | |
| 194 | + | |
| 194 | 195 | /* |
| 195 | 196 | * kernel variables |
| 196 | 197 | * Note: maximum error = NTP synch distance = dispersion + delay / 2; |