History

[PATCH] headers_check: remove <asm/timex.h> from user export

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.

David Woodhouse committed 20 years ago

Commit ee6baf81 parent 7f1cbe52 files · +3 −2Browse files

Unified · Split

2 files
  1. include/asm-generic/Kbuild.asm +1 −1
  2. include/linux/timex.h +2 −1
include/asm-generic/Kbuild.asm+1−1
@@ -2,7 +2,7 @@ unifdef-y += a.out.h auxvec.h byteorder.h errno.h fcntl.h ioctl.h \ · 1 unmodified line
2 ioctls.h ipcbuf.h mman.h msgbuf.h param.h poll.h \2 ioctls.h ipcbuf.h mman.h msgbuf.h param.h poll.h \
3 posix_types.h ptrace.h resource.h sembuf.h shmbuf.h shmparam.h \3 posix_types.h ptrace.h resource.h sembuf.h shmbuf.h shmparam.h \
4 sigcontext.h siginfo.h signal.h socket.h sockios.h stat.h \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.h5 statfs.h termbits.h termios.h types.h unistd.h user.h
6 6
7# These probably shouldn't be exported7# These probably shouldn't be exported
8unifdef-y += elf.h page.h8unifdef-y += elf.h page.h
include/linux/timex.h+2−1
@@ -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 chosen62 * 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 variables196 * kernel variables
196 * Note: maximum error = NTP synch distance = dispersion + delay / 2;197 * Note: maximum error = NTP synch distance = dispersion + delay / 2;