Merge branches 'l2', 'pgt2' and 'misc' into for-linus

	select SYS_SUPPORTS_APM_EMULATION

	select GENERIC_ATOMIC64 if (CPU_V6 || !CPU_32v6K || !AEABI)

	select HAVE_OPROFILE if (HAVE_PERF_EVENTS)

	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL

	select HAVE_ARCH_KGDB

	select HAVE_KPROBES if !XIP_KERNEL

	select HAVE_KRETPROBES if (HAVE_KPROBES)

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_LZO

	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_XZ

	select HAVE_IRQ_WORK

	select HAVE_PERF_EVENTS

	select PERF_USE_VMALLOC

	select GENERIC_IRQ_SHOW

	select CPU_PM if (SUSPEND || CPU_IDLE)

	select GENERIC_PCI_IOMAP

	select HAVE_BPF_JIT if NET

	help

	  The ARM series is a line of low-power-consumption RISC chip designs

	  licensed by ARM Ltd and targeted at embedded applications and

	select PLAT_VERSATILE

	select PLAT_VERSATILE_FPGA_IRQ

	select NEED_MACH_MEMORY_H

	select SPARSE_IRQ

	help

	  Support for ARM's Integrator platform.

	select HAVE_CLK

	select HAVE_PATA_PLATFORM

	select ICST

	select NO_IOPORT

	select PLAT_VERSATILE

	select PLAT_VERSATILE_CLCD

	help

		  Note that the system will appear to hang during boot if there

		  is nothing connected to read from the DCC.

	config DEBUG_SEMIHOSTING

		bool "Kernel low-level debug output via semihosting I"

		help

		  Semihosting enables code running on an ARM target to use

		  the I/O facilities on a host debugger/emulator through a

		  simple SVC calls. The host debugger or emulator must have

		  semihosting enabled for the special svc call to be trapped

		  otherwise the kernel will crash.

		  This is known to work with OpenOCD, as wellas

		  ARM's Fast Models, or any other controlling environment

		  that implements semihosting.

		  For more details about semihosting, please see

		  chapter 8 of DUI0203I_rvct_developer_guide.pdf from ARM Ltd.

	config AT91_DEBUG_LL_DBGU0

		bool "Kernel low-level debugging on rm9200, 9260/9g20, 9261/9g10 and 9rl"

		depends on HAVE_AT91_DBGU0

# If we have a machine-specific directory, then include it in the build.

core-y				+= arch/arm/kernel/ arch/arm/mm/ arch/arm/common/

core-y				+= arch/arm/net/

core-y				+= $(machdirs) $(platdirs)

drivers-$(CONFIG_OPROFILE)      += arch/arm/oprofile/

ashldi3.S

font.c

lib1funcs.S

piggy.gzip

piggy.lzo

piggy.lzma

piggy.xzkern

vmlinux

vmlinux.lds

suffix_$(CONFIG_KERNEL_GZIP) = gzip

suffix_$(CONFIG_KERNEL_LZO)  = lzo

suffix_$(CONFIG_KERNEL_LZMA) = lzma

suffix_$(CONFIG_KERNEL_XZ)   = xzkern

# Borrowed libfdt files for the ATAG compatibility mode

targets       := vmlinux vmlinux.lds \

		 piggy.$(suffix_y) piggy.$(suffix_y).o \

		 lib1funcs.o lib1funcs.S font.o font.c head.o misc.o $(OBJS)

		 lib1funcs.o lib1funcs.S ashldi3.o ashldi3.S \

		 font.o font.c head.o misc.o $(OBJS)

# Make sure files are removed during clean

extra-y       += piggy.gzip piggy.lzo piggy.lzma lib1funcs.S $(libfdt) $(libfdt_hdrs)

extra-y       += piggy.gzip piggy.lzo piggy.lzma piggy.xzkern \

		 lib1funcs.S ashldi3.S $(libfdt) $(libfdt_hdrs)

ifeq ($(CONFIG_FUNCTION_TRACER),y)

ORIG_CFLAGS := $(KBUILD_CFLAGS)

$(obj)/lib1funcs.S: $(srctree)/arch/$(SRCARCH)/lib/lib1funcs.S

	$(call cmd,shipped)

# For __aeabi_llsl

ashldi3 = $(obj)/ashldi3.o

$(obj)/ashldi3.S: $(srctree)/arch/$(SRCARCH)/lib/ashldi3.S

	$(call cmd,shipped)

# We need to prevent any GOTOFF relocs being used with references

# to symbols in the .bss section since we cannot relocate them

# independently from the rest at run time.  This can be achieved by

fi

$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.$(suffix_y).o \

	 	$(addprefix $(obj)/, $(OBJS)) $(lib1funcs) FORCE

		$(addprefix $(obj)/, $(OBJS)) $(lib1funcs) $(ashldi3) FORCE

	@$(check_for_multiple_zreladdr)

	$(call if_changed,ld)

	@$(check_for_bad_syms)