The patch titled
headers_check: remove <asm/timex.h> from user export
has been removed from the -mm tree. Its filename is
headers_check-remove-asm-timexh-from-user-export.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: headers_check: remove <asm/timex.h> from user export
From: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
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: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/asm-generic/Kbuild.asm | 2 +-
include/linux/timex.h | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff -puN include/asm-generic/Kbuild.asm~headers_check-remove-asm-timexh-from-user-export include/asm-generic/Kbuild.asm
--- a/include/asm-generic/Kbuild.asm~headers_check-remove-asm-timexh-from-user-export
+++ a/include/asm-generic/Kbuild.asm
@@ -2,7 +2,7 @@ unifdef-y += a.out.h auxvec.h byteorder.
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 \
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
unifdef-y += elf.h page.h
diff -puN include/linux/timex.h~headers_check-remove-asm-timexh-from-user-export include/linux/timex.h
--- a/include/linux/timex.h~headers_check-remove-asm-timexh-from-user-export
+++ a/include/linux/timex.h
@@ -57,7 +57,6 @@
#include <linux/time.h>
#include <asm/param.h>
-#include <asm/timex.h>
/*
* 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 */
#ifdef __KERNEL__
+#include <asm/timex.h>
+
/*
* kernel variables
* Note: maximum error = NTP synch distance = dispersion + delay / 2;
_
Patches currently in -mm which might be from dwmw2@xxxxxxxxxxxxx are
origin.patch
fix-make-headers_check-on-biarch-architectures-for.patch
fix-make-headers_check-on-s390-for-2618.patch
fix-make-headers_check-on-ia64-for-2618.patch
fix-make-headers_check-on-x86_64-for-2618.patch
fix-make-headers_check-on-i386-for-2618.patch
fix-make-headers_check-for-alpha-in-2618.patch
headers_check-use-a-different-default-directory.patch
mtd-nand-oob-buffer-offset-fixups.patch
jffs2-summary-fix-a-summary-collecting-bug.patch
arm-make-headers_check.patch
git-gfs2.patch
git-mtd.patch
mtd-maps-ixp4xx-partition-parsing.patch
fix-the-unlock-addr-lookup-bug-in-mtd-jedec-probe.patch
mtd-printk-format-warning.patch
fs-jffs2-jffs2_fs_ih-removal-of-old-code.patch
drivers-mtd-nand-au1550ndc-removal-of-old-code.patch
fix-make-headers_check-for-parisc-in-2618.patch
pci-quirks-update.patch
avr32-mtd-static-memory-controller-driver-try-2.patch
avr32-mtd-unlock-flash-if-necessary-try-2.patch
avr32-mtd-at49bv6416-platform-device-for-atstk1000.patch
split-i386-and-x86_64-ptraceh.patch
split-i386-and-x86_64-ptraceh-fix.patch
make-uml-use-ptrace-abih.patch
fs-conversions-from-kmallocmemset-to-kzcalloc.patch
add-config_headers_check-option-to-automatically-run-make-headers_check.patch
pci-mtd-switch-to-pci_get_device-and-do-ref-counting.patch
the-scheduled-removal-of-some-oss-drivers-fix-fix.patch
debug-shared-irqs.patch
debug-shared-irqs-kconfig-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
