Commit ee6baf88 authored by David Woodhouse's avatar David Woodhouse Committed by Linus Torvalds
Browse files

[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.

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7f1cbe51

include/asm-generic/Kbuild.asm

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ unifdef-y += a.out.h auxvec.h byteorder.h errno.h fcntl.h ioctl.h \ 
	ioctls.h ipcbuf.h mman.h msgbuf.h param.h poll.h		\

	ioctls.h ipcbuf.h mman.h msgbuf.h param.h poll.h		\

	posix_types.h ptrace.h resource.h sembuf.h shmbuf.h shmparam.h	\

	posix_types.h ptrace.h resource.h sembuf.h shmbuf.h shmparam.h	\

	sigcontext.h siginfo.h signal.h socket.h sockios.h stat.h	\

	sigcontext.h siginfo.h signal.h socket.h sockios.h stat.h	\

	statfs.h termbits.h termios.h timex.h types.h unistd.h user.h

	statfs.h termbits.h termios.h types.h unistd.h user.h





# These probably shouldn't be exported

# These probably shouldn't be exported

unifdef-y += elf.h page.h
 
unifdef-y += elf.h page.h

include/linux/timex.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -57,7 +57,6 @@ 
#include <linux/time.h>

#include <linux/time.h>





#include <asm/param.h>

#include <asm/param.h>

#include <asm/timex.h>





/*

/*

 * SHIFT_KG and SHIFT_KF establish the damping of the PLL and are chosen

 * SHIFT_KG and SHIFT_KF establish the damping of the PLL and are chosen
@@ -191,6 +190,8 @@ struct timex { 
#define TIME_BAD	TIME_ERROR /* bw compat */

#define TIME_BAD	TIME_ERROR /* bw compat */





#ifdef __KERNEL__

#ifdef __KERNEL__

#include <asm/timex.h>



/*

/*

 * kernel variables

 * kernel variables

 * Note: maximum error = NTP synch distance = dispersion + delay / 2;

 * Note: maximum error = NTP synch distance = dispersion + delay / 2;

CRA Git | Maintained and supported by SUSTech CRA and CCSE