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

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

Merge branch 'core-v28-for-linus' of... 

Merge branch 'core-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  do_generic_file_read: s/EINTR/EIO/ if lock_page_killable() fails
  softirq, warning fix: correct a format to avoid a warning
  softirqs, debug: preemption check
  x86, pci-hotplug, calgary / rio: fix EBDA ioremap()
  IO resources, x86: ioremap sanity check to catch mapping requests exceeding, fix
  IO resources, x86: ioremap sanity check to catch mapping requests exceeding the BAR sizes
  softlockup: Documentation/sysctl/kernel.txt: fix softlockup_thresh description
  dmi scan: warn about too early calls to dmi_check_system()
  generic: redefine resource_size_t as phys_addr_t
  generic: make PFN_PHYS explicitly return phys_addr_t
  generic: add phys_addr_t for holding physical addresses
  softirq: allocate less vectors
  IO resources: fix/remove printk
  printk: robustify printk, update comment
  printk: robustify printk, fix #2
  printk: robustify printk, fix
  printk: robustify printk

Fixed up conflicts in:
	arch/powerpc/include/asm/types.h
	arch/powerpc/platforms/Kconfig.cputype
manually.
parents 0999d978 6b2ada82

arch/m32r/mm/discontig.c

+2 −2
Original line number Diff line number Diff line
@@ -111,9 +111,9 @@ unsigned long __init setup_memory(void) 
				initrd_start, INITRD_SIZE);

		} else {

			printk("initrd extends beyond end of memory "

				"(0x%08lx > 0x%08lx)\ndisabling initrd\n",

				"(0x%08lx > 0x%08llx)\ndisabling initrd\n",

				INITRD_START + INITRD_SIZE,

				PFN_PHYS(max_low_pfn));

			        (unsigned long long)PFN_PHYS(max_low_pfn));



			initrd_start = 0;

		}

arch/powerpc/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ config WORD_SIZE 
config PPC_MERGE

	def_bool y



config ARCH_PHYS_ADDR_T_64BIT

       def_bool PPC64 || PHYS_64BIT



config MMU

	bool

	default y

arch/powerpc/include/asm/types.h

+0 −7
Original line number Diff line number Diff line
@@ -48,13 +48,6 @@ typedef struct { 


typedef __vector128 vector128;



/* Physical address used by some IO functions */

#if defined(CONFIG_PPC64) || defined(CONFIG_PHYS_64BIT)

typedef u64 phys_addr_t;

#else

typedef u32 phys_addr_t;

#endif



#if defined(__powerpc64__) || defined(CONFIG_PHYS_64BIT)

typedef u64 dma_addr_t;

#else

arch/powerpc/platforms/Kconfig.cputype

+0 −1
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ config PTE_64BIT 
config PHYS_64BIT

	bool 'Large physical address support' if E500 || PPC_86xx

	depends on (44x || E500 || PPC_86xx) && !PPC_83xx && !PPC_82xx

	select RESOURCES_64BIT

	---help---

	  This option enables kernel support for larger than 32-bit physical

	  addresses.  This feature may not be available on all cores.

arch/powerpc/sysdev/ppc4xx_pci.c

+6 −10
Original line number Diff line number Diff line
@@ -39,13 +39,10 @@ static int dma_offset_set; 
#define U64_TO_U32_LOW(val)	((u32)((val) & 0x00000000ffffffffULL))

#define U64_TO_U32_HIGH(val)	((u32)((val) >> 32))



#ifdef CONFIG_RESOURCES_64BIT

#define RES_TO_U32_LOW(val)	U64_TO_U32_LOW(val)

#define RES_TO_U32_HIGH(val)	U64_TO_U32_HIGH(val)

#else

#define RES_TO_U32_LOW(val)	(val)

#define RES_TO_U32_HIGH(val)	(0)

#endif

#define RES_TO_U32_LOW(val)	\

	((sizeof(resource_size_t) > sizeof(u32)) ? U64_TO_U32_LOW(val) : (val))

#define RES_TO_U32_HIGH(val)	\

	((sizeof(resource_size_t) > sizeof(u32)) ? U64_TO_U32_HIGH(val) : (0))



static inline int ppc440spe_revA(void)

{
@@ -144,12 +141,11 @@ static int __init ppc4xx_parse_dma_ranges(struct pci_controller *hose, 


		/* Use that */

		res->start = pci_addr;

#ifndef CONFIG_RESOURCES_64BIT

		/* Beware of 32 bits resources */

		if ((pci_addr + size) > 0x100000000ull)

		if (sizeof(resource_size_t) == sizeof(u32) &&

		    (pci_addr + size) > 0x100000000ull)

			res->end = 0xffffffff;

		else

#endif

			res->end = res->start + size - 1;

		break;

	}