mirror of
https://github.com/torvalds/linux.git
synced 2024-12-18 17:12:55 +00:00
c9bed1cf51
- Stolen ticks and PV wallclock support for arm/arm64. - Add grant copy ioctl to gntdev device. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJWk5IUAAoJEFxbo/MsZsTRLxwH/1BDcrbQDRc5hxUOG9JEYSUt H/lMjvZRShPkzweijdNon95ywAXhcSbkS9IV2Mp0+CZV7VyeymW7QIW/g4+G6iRg +LnoV77PAhPv/cmsr1pENXqRCclvemlxQOf7UyWLezuKhB71LC+oNaEnpk/tPIZS et/qef+m/SgSP5R91nO0Esv2KfP7za0UrgJf3Ee4GzjSeDkya0Hko06Cy3yc1/RT 082kHpQ1/KFcHHh2qhdCQwyzhq/cwFkuDA6ksKYJoxC6YAVC2mvvkuIOZYbloHDL c/dzuP9qjjxOZ7Gblv2cmg+RE4UqRfBhxmMycxSCcwW/Mt5LaftCpAxpBQKq2/8= =6F/q -----END PGP SIGNATURE----- Merge tag 'for-linus-4.5-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip Pull xen updates from David Vrabel: "Xen features and fixes for 4.5-rc0: - Stolen ticks and PV wallclock support for arm/arm64 - Add grant copy ioctl to gntdev device" * tag 'for-linus-4.5-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: xen/gntdev: add ioctl for grant copy x86/xen: don't reset vcpu_info on a cancelled suspend xen/gntdev: constify mmu_notifier_ops structures xen/grant-table: constify gnttab_ops structure xen/time: use READ_ONCE xen/x86: convert remaining timespec to timespec64 in xen_pvclock_gtod_notify xen/x86: support XENPF_settime64 xen/arm: set the system time in Xen via the XENPF_settime64 hypercall xen/arm: introduce xen_read_wallclock arm: extend pvclock_wall_clock with sec_hi xen: introduce XENPF_settime64 xen/arm: introduce HYPERVISOR_platform_op on arm and arm64 xen: rename dom0_op to platform_op xen/arm: account for stolen ticks arm64: introduce CONFIG_PARAVIRT, PARAVIRT_TIME_ACCOUNTING and pv_time_ops arm: introduce CONFIG_PARAVIRT, PARAVIRT_TIME_ACCOUNTING and pv_time_ops missing include asm/paravirt.h in cputime.c xen: move xen_setup_runstate_info and get_runstate_snapshot to drivers/xen/time.c
98 lines
2.9 KiB
Makefile
98 lines
2.9 KiB
Makefile
#
|
|
# Makefile for the linux kernel.
|
|
#
|
|
|
|
CPPFLAGS_vmlinux.lds := -DTEXT_OFFSET=$(TEXT_OFFSET)
|
|
AFLAGS_head.o := -DTEXT_OFFSET=$(TEXT_OFFSET)
|
|
|
|
ifdef CONFIG_FUNCTION_TRACER
|
|
CFLAGS_REMOVE_ftrace.o = -pg
|
|
CFLAGS_REMOVE_insn.o = -pg
|
|
CFLAGS_REMOVE_patch.o = -pg
|
|
endif
|
|
|
|
CFLAGS_REMOVE_return_address.o = -pg
|
|
|
|
# Object file lists.
|
|
|
|
obj-y := elf.o entry-common.o irq.o opcodes.o \
|
|
process.o ptrace.o reboot.o return_address.o \
|
|
setup.o signal.o sigreturn_codes.o \
|
|
stacktrace.o sys_arm.o time.o traps.o
|
|
|
|
obj-$(CONFIG_ATAGS) += atags_parse.o
|
|
obj-$(CONFIG_ATAGS_PROC) += atags_proc.o
|
|
obj-$(CONFIG_DEPRECATED_PARAM_STRUCT) += atags_compat.o
|
|
|
|
ifeq ($(CONFIG_CPU_V7M),y)
|
|
obj-y += entry-v7m.o v7m.o
|
|
else
|
|
obj-y += entry-armv.o
|
|
endif
|
|
|
|
obj-$(CONFIG_CPU_IDLE) += cpuidle.o
|
|
obj-$(CONFIG_ISA_DMA_API) += dma.o
|
|
obj-$(CONFIG_FIQ) += fiq.o fiqasm.o
|
|
obj-$(CONFIG_MODULES) += armksyms.o module.o
|
|
obj-$(CONFIG_ARM_MODULE_PLTS) += module-plts.o
|
|
obj-$(CONFIG_ISA_DMA) += dma-isa.o
|
|
obj-$(CONFIG_PCI) += bios32.o isa.o
|
|
obj-$(CONFIG_ARM_CPU_SUSPEND) += sleep.o suspend.o
|
|
obj-$(CONFIG_HIBERNATION) += hibernate.o
|
|
obj-$(CONFIG_SMP) += smp.o
|
|
ifdef CONFIG_MMU
|
|
obj-$(CONFIG_SMP) += smp_tlb.o
|
|
endif
|
|
obj-$(CONFIG_HAVE_ARM_SCU) += smp_scu.o
|
|
obj-$(CONFIG_HAVE_ARM_TWD) += smp_twd.o
|
|
obj-$(CONFIG_ARM_ARCH_TIMER) += arch_timer.o
|
|
obj-$(CONFIG_FUNCTION_TRACER) += entry-ftrace.o
|
|
obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o insn.o
|
|
obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o insn.o
|
|
obj-$(CONFIG_JUMP_LABEL) += jump_label.o insn.o patch.o
|
|
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
|
|
# Main staffs in KPROBES are in arch/arm/probes/ .
|
|
obj-$(CONFIG_KPROBES) += patch.o insn.o
|
|
obj-$(CONFIG_OABI_COMPAT) += sys_oabi-compat.o
|
|
obj-$(CONFIG_ARM_THUMBEE) += thumbee.o
|
|
obj-$(CONFIG_KGDB) += kgdb.o patch.o
|
|
obj-$(CONFIG_ARM_UNWIND) += unwind.o
|
|
obj-$(CONFIG_HAVE_TCM) += tcm.o
|
|
obj-$(CONFIG_OF) += devtree.o
|
|
obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
|
|
obj-$(CONFIG_SWP_EMULATE) += swp_emulate.o
|
|
CFLAGS_swp_emulate.o := -Wa,-march=armv7-a
|
|
obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o
|
|
|
|
obj-$(CONFIG_CPU_XSCALE) += xscale-cp0.o
|
|
obj-$(CONFIG_CPU_XSC3) += xscale-cp0.o
|
|
obj-$(CONFIG_CPU_MOHAWK) += xscale-cp0.o
|
|
obj-$(CONFIG_CPU_PJ4) += pj4-cp0.o
|
|
obj-$(CONFIG_CPU_PJ4B) += pj4-cp0.o
|
|
obj-$(CONFIG_IWMMXT) += iwmmxt.o
|
|
obj-$(CONFIG_PERF_EVENTS) += perf_regs.o perf_callchain.o
|
|
obj-$(CONFIG_HW_PERF_EVENTS) += perf_event_xscale.o perf_event_v6.o \
|
|
perf_event_v7.o
|
|
AFLAGS_iwmmxt.o := -Wa,-mcpu=iwmmxt
|
|
obj-$(CONFIG_ARM_CPU_TOPOLOGY) += topology.o
|
|
obj-$(CONFIG_VDSO) += vdso.o
|
|
obj-$(CONFIG_EFI) += efi.o
|
|
|
|
ifneq ($(CONFIG_ARCH_EBSA110),y)
|
|
obj-y += io.o
|
|
endif
|
|
obj-$(CONFIG_PARAVIRT) += paravirt.o
|
|
|
|
head-y := head$(MMUEXT).o
|
|
obj-$(CONFIG_DEBUG_LL) += debug.o
|
|
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
|
|
|
|
obj-$(CONFIG_ARM_VIRT_EXT) += hyp-stub.o
|
|
ifeq ($(CONFIG_ARM_PSCI),y)
|
|
obj-$(CONFIG_SMP) += psci_smp.o
|
|
endif
|
|
|
|
obj-$(CONFIG_HAVE_ARM_SMCCC) += smccc-call.o
|
|
|
|
extra-y := $(head-y) vmlinux.lds
|