Merge tag 'powerpc-5.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

	bool

	default y

config ARCH_HAS_DMA_SET_COHERENT_MASK

        bool

config PPC

	bool

	default y

	select ARCH_32BIT_OFF_T if PPC32

	select ARCH_HAS_DEBUG_VIRTUAL

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_DMA_SET_COHERENT_MASK

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_FORTIFY_SOURCE

	select ARCH_HAS_GCOV_PROFILE_ALL

	select ARCH_HAS_KCOV

	select ARCH_HAS_PHYS_TO_DMA

	select ARCH_HAS_PMEM_API                if PPC64

	select ARCH_HAS_PTE_SPECIAL

	select HAVE_IOREMAP_PROT

	select HAVE_IRQ_EXIT_ON_IRQ_STACK

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_XZ			if PPC_BOOK3S

	select HAVE_KERNEL_XZ			if PPC_BOOK3S || 44x

	select HAVE_KPROBES

	select HAVE_KPROBES_ON_FTRACE

	select HAVE_KRETPROBES

	select HAVE_PERF_USER_STACK_DUMP

	select HAVE_RCU_TABLE_FREE		if SMP

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_RELIABLE_STACKTRACE		if PPC64 && CPU_LITTLE_ENDIAN

	select HAVE_RELIABLE_STACKTRACE		if PPC_BOOK3S_64 && CPU_LITTLE_ENDIAN

	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_VIRT_CPU_ACCOUNTING

	select HAVE_IRQ_TIME_ACCOUNTING

	select RTC_LIB

	select SPARSE_IRQ

	select SYSCTL_EXCEPTION_TRACE

	select THREAD_INFO_IN_TASK

	select VIRT_TO_BUS			if !PPC64

	#

	# Please keep this list sorted alphabetically.

    default y

    depends on PPC_BOOK3S_64 || PPC_FSL_BOOK3E

config GENERIC_CSUM

	def_bool n

config EARLY_PRINTK

	bool

	default y

config ARCH_ENABLE_MEMORY_HOTPLUG

	def_bool y

config ARCH_HAS_WALK_MEMORY

	def_bool y

config ARCH_ENABLE_MEMORY_HOTREMOVE

	def_bool y

config PPC_64K_PAGES

	bool "64k page size"

	depends on !PPC_FSL_BOOK3E && (44x || PPC_BOOK3S_64 || PPC_BOOK3E_64)

	depends on 44x || PPC_BOOK3S_64

	select HAVE_ARCH_SOFT_DIRTY if PPC_BOOK3S_64

config PPC_256K_PAGES

endchoice

config PPC_PAGE_SHIFT

	int

	default 18 if PPC_256K_PAGES

	default 16 if PPC_64K_PAGES

	default 14 if PPC_16K_PAGES

	default 12

config THREAD_SHIFT

	int "Thread shift" if EXPERT

	range 13 15

	  Used to define the stack size. The default is almost always what you

	  want. Only change this if you know what you are doing.

config ETEXT_SHIFT_BOOL

	bool "Set custom etext alignment" if STRICT_KERNEL_RWX && \

					     (PPC_BOOK3S_32 || PPC_8xx)

	depends on ADVANCED_OPTIONS

	help

	  This option allows you to set the kernel end of text alignment. When

	  RAM is mapped by blocks, the alignment needs to fit the size and

	  number of possible blocks. The default should be OK for most configs.

	  Say N here unless you know what you are doing.

config ETEXT_SHIFT

	int "_etext shift" if ETEXT_SHIFT_BOOL

	range 17 28 if STRICT_KERNEL_RWX && PPC_BOOK3S_32

	range 19 23 if STRICT_KERNEL_RWX && PPC_8xx

	default 17 if STRICT_KERNEL_RWX && PPC_BOOK3S_32

	default 19 if STRICT_KERNEL_RWX && PPC_8xx

	default PPC_PAGE_SHIFT

	help

	  On Book3S 32 (603+), IBATs are used to map kernel text.

	  Smaller is the alignment, greater is the number of necessary IBATs.

	  On 8xx, large pages (512kb or 8M) are used to map kernel linear

	  memory. Aligning to 8M reduces TLB misses as only 8M pages are used

	  in that case.

config DATA_SHIFT_BOOL

	bool "Set custom data alignment" if STRICT_KERNEL_RWX && \

					    (PPC_BOOK3S_32 || PPC_8xx)

	depends on ADVANCED_OPTIONS

	help

	  This option allows you to set the kernel data alignment. When

	  RAM is mapped by blocks, the alignment needs to fit the size and

	  number of possible blocks. The default should be OK for most configs.

	  Say N here unless you know what you are doing.

config DATA_SHIFT

	int "Data shift" if DATA_SHIFT_BOOL

	default 24 if STRICT_KERNEL_RWX && PPC64

	range 17 28 if STRICT_KERNEL_RWX && PPC_BOOK3S_32

	range 19 23 if STRICT_KERNEL_RWX && PPC_8xx

	default 22 if STRICT_KERNEL_RWX && PPC_BOOK3S_32

	default 23 if STRICT_KERNEL_RWX && PPC_8xx

	default PPC_PAGE_SHIFT

	help

	  On Book3S 32 (603+), DBATs are used to map kernel text and rodata RO.

	  Smaller is the alignment, greater is the number of necessary DBATs.

	  On 8xx, large pages (512kb or 8M) are used to map kernel linear

	  memory. Aligning to 8M reduces TLB misses as only 8M pages are used

	  in that case.

config FORCE_MAX_ZONEORDER

	int "Maximum zone order"

	range 8 9 if PPC64 && PPC_64K_PAGES

config FSL_PCI

 	bool

	select ARCH_HAS_DMA_SET_MASK

	select PPC_INDIRECT_PCI

	select PCI_QUIRKS

	  If you are unsure, say N.

config PPC_HTDUMP

	def_bool y

	depends on PPC_PTDUMP && PPC_BOOK3S_64

config PPC_FAST_ENDIAN_SWITCH

	bool "Deprecated fast endian-switch syscall"

        depends on DEBUG_KERNEL && PPC_BOOK3S_64

asinstr := $(call as-instr,lis 9$(comma)foo@high,-DHAVE_AS_ATHIGH=1)

KBUILD_CPPFLAGS	+= -Iarch/$(ARCH) $(asinstr)

KBUILD_AFLAGS	+= -Iarch/$(ARCH) $(AFLAGS-y)

KBUILD_AFLAGS	+= $(AFLAGS-y)

KBUILD_CFLAGS	+= $(call cc-option,-msoft-float)

KBUILD_CFLAGS	+= -pipe -Iarch/$(ARCH) $(CFLAGS-y)

KBUILD_CFLAGS	+= -pipe $(CFLAGS-y)

CPP		= $(CC) -E $(KBUILD_CFLAGS)

CHECKFLAGS	+= -m$(BITS) -D__powerpc__ -D__powerpc$(BITS)__

endif

endif

ifdef CONFIG_SMP

prepare: task_cpu_prepare

task_cpu_prepare: prepare0

	$(eval KBUILD_CFLAGS += -D_TASK_CPU=$(shell awk '{if ($$2 == "TASK_CPU") print $$3;}' include/generated/asm-offsets.h))

endif

# Check toolchain versions:

# - gcc-4.6 is the minimum kernel-wide version so nothing required.

checkbin:

dtstree		:= $(srctree)/$(src)

dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))

dtb-$(CONFIG_XILINX_VIRTEX440_GENERIC_BOARD) += virtex440-ml507.dtb virtex440-ml510.dtb

			d-cache-size = <32768>;

			dcr-controller;

			dcr-access-method = "native";

			status = "ok";

			status = "okay";

		};

		cpu@1 {

			device_type = "cpu";