From: Ingo Molnar <mingo@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org,
Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [GIT PULL] x86/headers changes for v4.8
Date: Mon, 1 Aug 2016 11:11:46 +0200 [thread overview]
Message-ID: <20160801091146.GA6273@gmail.com> (raw)
Linus,
Please pull the latest x86-headers-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-headers-for-linus
# HEAD: a47177d360a22ddaa7584186e7e1c74e49220bbe x86, crypto: Restore MODULE_LICENSE() to glue_helper.c so it loads
This tree is a cleanup of the x86 tree reducing spurious uses of module.h - which
should improve build performance a bit.
NOTE: when merged with your tree you'll probably see two conflicts, in:
arch/x86/lib/csum-wrappers_64.c
arch/x86/lib/usercopy_64.c
The conflict resolutions are trivial - I've attached my version of the resolutions
further below.
Thanks,
Ingo
------------------>
Ingo Molnar (1):
Merge branch 'x86/platform' into x86/headers, to apply dependent patches
Paul Gortmaker (10):
x86: Don't use module.h just for AUTHOR / LICENSE tags
x86/mm: Audit and remove any unnecessary uses of module.h
x86/kernel: Audit and remove any unnecessary uses of module.h
x86/lib: Audit and remove any unnecessary uses of module.h
x86/platform: Audit and remove any unnecessary uses of module.h
x86/xen: Audit and remove any unnecessary uses of module.h
x86/kvm: Audit and remove any unnecessary uses of module.h
x86: Audit and remove any remaining unnecessary uses of module.h
x86/platform: Delete extraneous MODULE_* tags fromm ts5500
x86, crypto: Restore MODULE_LICENSE() to glue_helper.c so it loads
Stephen Rothwell (1):
x86/headers: Include spinlock_types.h in x8664_ksyms_64.c for missing spinlock_t
Wei Yongjun (2):
x86/ce4100: Remove duplicated include from ce4100.c
x86/apic: Remove duplicated include from probe_64.c
arch/x86/events/amd/ibs.c | 3 ++-
arch/x86/events/amd/iommu.c | 2 +-
arch/x86/events/core.c | 3 ++-
arch/x86/events/intel/uncore.c | 2 ++
arch/x86/events/intel/uncore.h | 1 -
arch/x86/include/asm/livepatch.h | 1 -
arch/x86/include/asm/topology.h | 1 +
arch/x86/kernel/acpi/boot.c | 2 +-
arch/x86/kernel/acpi/cstate.c | 2 +-
arch/x86/kernel/amd_gart_64.c | 1 -
arch/x86/kernel/amd_nb.c | 2 +-
arch/x86/kernel/apic/apic.c | 2 +-
arch/x86/kernel/apic/apic_flat_64.c | 2 +-
arch/x86/kernel/apic/apic_noop.c | 1 -
arch/x86/kernel/apic/hw_nmi.c | 2 +-
arch/x86/kernel/apic/io_apic.c | 2 +-
arch/x86/kernel/apic/ipi.c | 1 -
arch/x86/kernel/apic/probe_32.c | 2 +-
arch/x86/kernel/apic/probe_64.c | 3 +--
arch/x86/kernel/apic/x2apic_uv_x.c | 2 +-
arch/x86/kernel/cpu/common.c | 2 +-
arch/x86/kernel/cpu/hypervisor.c | 3 ++-
arch/x86/kernel/cpu/intel.c | 2 +-
arch/x86/kernel/cpu/match.c | 2 +-
arch/x86/kernel/cpu/mshyperv.c | 3 ++-
arch/x86/kernel/cpu/mtrr/cleanup.c | 1 -
arch/x86/kernel/cpu/mtrr/generic.c | 2 +-
arch/x86/kernel/cpu/mtrr/if.c | 1 -
arch/x86/kernel/cpu/mtrr/main.c | 2 +-
arch/x86/kernel/cpu/perfctr-watchdog.c | 2 +-
arch/x86/kernel/cpu/vmware.c | 3 ++-
arch/x86/kernel/crash.c | 2 +-
arch/x86/kernel/dumpstack_32.c | 2 +-
arch/x86/kernel/dumpstack_64.c | 2 +-
arch/x86/kernel/hw_breakpoint.c | 3 ++-
arch/x86/kernel/i386_ksyms_32.c | 3 ++-
arch/x86/kernel/i8253.c | 2 +-
arch/x86/kernel/io_delay.c | 2 +-
arch/x86/kernel/irq_32.c | 1 -
arch/x86/kernel/irq_64.c | 1 -
arch/x86/kernel/kdebugfs.c | 2 +-
arch/x86/kernel/kvm.c | 2 +-
arch/x86/kernel/mpparse.c | 1 -
arch/x86/kernel/paravirt-spinlocks.c | 2 +-
arch/x86/kernel/paravirt.c | 3 ++-
arch/x86/kernel/pci-swiotlb.c | 2 +-
arch/x86/kernel/pmem.c | 2 +-
arch/x86/kernel/process.c | 3 ++-
arch/x86/kernel/process_32.c | 2 +-
arch/x86/kernel/process_64.c | 2 +-
arch/x86/kernel/reboot.c | 2 +-
arch/x86/kernel/setup.c | 2 +-
arch/x86/kernel/smpboot.c | 2 +-
arch/x86/kernel/stacktrace.c | 2 +-
arch/x86/kernel/test_rodata.c | 5 -----
arch/x86/kernel/traps.c | 2 +-
arch/x86/kernel/tsc.c | 2 +-
arch/x86/kernel/x8664_ksyms_64.c | 3 ++-
arch/x86/kernel/x86_init.c | 2 +-
arch/x86/kvm/cpuid.c | 2 +-
arch/x86/kvm/emulate.c | 1 -
arch/x86/kvm/iommu.c | 2 +-
arch/x86/kvm/irq.c | 2 +-
arch/x86/kvm/lapic.c | 2 +-
arch/x86/kvm/mmu.c | 3 ++-
arch/x86/kvm/x86.c | 3 ++-
arch/x86/lib/cache-smp.c | 2 +-
arch/x86/lib/cpu.c | 3 ++-
arch/x86/lib/csum-partial_64.c | 2 +-
arch/x86/lib/csum-wrappers_64.c | 2 +-
arch/x86/lib/delay.c | 2 +-
arch/x86/lib/memcpy_32.c | 2 +-
arch/x86/lib/mmx_32.c | 2 +-
arch/x86/lib/msr-reg-export.c | 2 +-
arch/x86/lib/msr-smp.c | 2 +-
arch/x86/lib/msr.c | 3 ++-
arch/x86/lib/string_32.c | 2 +-
arch/x86/lib/usercopy.c | 2 +-
arch/x86/lib/usercopy_32.c | 2 +-
arch/x86/lib/usercopy_64.c | 2 +-
arch/x86/mm/amdtopology.c | 1 -
arch/x86/mm/dump_pagetables.c | 6 +-----
arch/x86/mm/highmem_32.c | 2 +-
arch/x86/mm/init_32.c | 1 -
arch/x86/mm/init_64.c | 1 -
arch/x86/mm/iomap_32.c | 2 +-
arch/x86/mm/ioremap.c | 1 -
arch/x86/mm/kmemcheck/kmemcheck.c | 1 -
arch/x86/mm/kmemcheck/shadow.c | 2 +-
arch/x86/mm/kmmio.c | 2 +-
arch/x86/mm/mmio-mod.c | 2 +-
arch/x86/mm/numa.c | 1 -
arch/x86/mm/numa_32.c | 2 +-
arch/x86/mm/pat.c | 1 -
arch/x86/mm/pat_rbtree.c | 1 -
arch/x86/mm/pf_in.c | 1 -
arch/x86/mm/pgtable_32.c | 1 -
arch/x86/mm/physaddr.c | 2 +-
arch/x86/mm/srat.c | 2 +-
arch/x86/mm/tlb.c | 2 +-
arch/x86/pci/xen.c | 2 +-
arch/x86/platform/ce4100/ce4100.c | 2 --
arch/x86/platform/efi/efi_64.c | 2 +-
arch/x86/platform/intel-mid/intel-mid.c | 2 +-
arch/x86/platform/intel-mid/pwr.c | 4 +---
arch/x86/platform/intel-mid/sfi.c | 2 +-
arch/x86/platform/olpc/olpc.c | 2 +-
arch/x86/platform/olpc/olpc_ofw.c | 5 ++++-
arch/x86/platform/ts5500/ts5500.c | 6 +-----
arch/x86/platform/uv/uv_irq.c | 2 +-
arch/x86/platform/uv/uv_nmi.c | 2 +-
arch/x86/um/delay.c | 2 +-
arch/x86/xen/debugfs.c | 1 -
arch/x86/xen/enlighten.c | 2 +-
arch/x86/xen/mmu.c | 3 ++-
arch/x86/xen/p2m.c | 2 +-
arch/x86/xen/platform-pci-unplug.c | 2 +-
arch/x86/xen/setup.c | 2 +-
118 files changed, 113 insertions(+), 132 deletions(-)
------------------>
diff --cc arch/x86/lib/csum-wrappers_64.c
index b6fcb9a9ddbc,f8dc05d0881e..000000000000
--- a/arch/x86/lib/csum-wrappers_64.c
+++ b/arch/x86/lib/csum-wrappers_64.c
@@@ -5,8 -5,7 +5,8 @@@
* Wrappers of assembly checksum functions for x86-64.
*/
#include <asm/checksum.h>
- #include <linux/module.h>
+#include <linux/uaccess.h>
+ #include <linux/export.h>
#include <asm/smap.h>
/**
diff --cc arch/x86/lib/usercopy_64.c
index 9f760cdcaf40,e1e0364cb9dd..000000000000
--- a/arch/x86/lib/usercopy_64.c
+++ b/arch/x86/lib/usercopy_64.c
@@@ -5,8 -5,8 +5,8 @@@
* Copyright 1997 Linus Torvalds
* Copyright 2002 Andi Kleen <ak@suse.de>
*/
- #include <linux/module.h>
+ #include <linux/export.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/*
* Zero Userspace
reply other threads:[~2016-08-01 9:12 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160801091146.GA6273@gmail.com \
--to=mingo@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.