Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af955987 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

parents 4ad5bd25 9a94c579

arch/powerpc/Makefile

+10 −6
Original line number Diff line number Diff line
@@ -61,15 +61,17 @@ endif 
LDFLAGS_vmlinux	:= -Bstatic



# The -Iarch/$(ARCH)/include is temporary while we are merging

CPPFLAGS	+= -Iarch/$(ARCH) -Iarch/$(ARCH)/include

AFLAGS		+= -Iarch/$(ARCH)

CFLAGS		+= -Iarch/$(ARCH) -msoft-float -pipe

CPPFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH) -Iarch/$(ARCH)/include

AFLAGS-$(CONFIG_PPC32)	:= -Iarch/$(ARCH)

CFLAGS-$(CONFIG_PPC64)	:= -mminimal-toc -mtraceback=none  -mcall-aixdesc

CFLAGS-$(CONFIG_PPC32)	:= -ffixed-r2 -mmultiple

CFLAGS		+= $(CFLAGS-y)

CFLAGS-$(CONFIG_PPC32)	:= -Iarch/$(ARCH) -ffixed-r2 -mmultiple

CPPFLAGS	+= $(CPPFLAGS-y)

AFLAGS		+= $(AFLAGS-y)

CFLAGS		+= -msoft-float -pipe $(CFLAGS-y)

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

# Temporary hack until we have migrated to asm-powerpc

LINUXINCLUDE    += -Iarch/$(ARCH)/include

LINUXINCLUDE-$(CONFIG_PPC32)	:= -Iarch/$(ARCH)/include

LINUXINCLUDE    += $(LINUXINCLUDE-y)



CHECKFLAGS	+= -m$(SZ) -D__powerpc__ -D__powerpc$(SZ)__
@@ -173,11 +175,13 @@ archclean: 


archprepare: checkbin



ifeq ($(CONFIG_PPC32),y)

# Temporary hack until we have migrated to asm-powerpc

include/asm: arch/$(ARCH)/include/asm

arch/$(ARCH)/include/asm: FORCE

	$(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi

	$(Q)ln -fsn $(srctree)/include/asm-$(OLDARCH) arch/$(ARCH)/include/asm

endif



# Use the file '.tmp_gas_check' for binutils tests, as gas won't output

# to stdout and these checks are run even on install targets.

arch/powerpc/mm/hugetlbpage.c

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ int prepare_hugepage_range(unsigned long addr, unsigned long len) 
	if (addr < 0x100000000UL)

		err = open_low_hpage_areas(current->mm,

					  LOW_ESID_MASK(addr, len));

	if ((addr + len) >= 0x100000000UL)

	if ((addr + len) > 0x100000000UL)

		err = open_high_hpage_areas(current->mm,

					    HTLB_AREA_MASK(addr, len));

	if (err) {

arch/powerpc/platforms/iseries/iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Rewrite, cleanup:

 *

 * Copyright (C) 2004 Olof Johansson <olof@austin.ibm.com>, IBM Corporation

 * Copyright (C) 2004 Olof Johansson <olof@lixom.net>, IBM Corporation

 *

 * Dynamic DMA mapping support, iSeries-specific parts.

 *

arch/powerpc/platforms/pseries/iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *

 * Rewrite, cleanup: 

 *

 * Copyright (C) 2004 Olof Johansson <olof@austin.ibm.com>, IBM Corporation

 * Copyright (C) 2004 Olof Johansson <olof@lixom.net>, IBM Corporation

 *

 * Dynamic DMA mapping support, pSeries-specific parts, both SMP and LPAR.

 *

arch/powerpc/sysdev/dart.h

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2004 Olof Johansson <olof@austin.ibm.com>, IBM Corporation

 * Copyright (C) 2004 Olof Johansson <olof@lixom.net>, IBM Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by