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

* '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.

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/include/asm/types.h
index a9a9262,c646f34..c004c13
--- 1/arch/powerpc/include/asm/types.h
--- 2/arch/powerpc/include/asm/types.h
+++ b/arch/powerpc/include/asm/types.h
@@@ -48,14 -48,7 +48,7 @@@ 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
- 
 -#ifdef __powerpc64__
 +#if defined(__powerpc64__) || defined(CONFIG_PHYS_64BIT)
  typedef u64 dma_addr_t;
  #else
  typedef u32 dma_addr_t;

diff --cc arch/powerpc/platforms/Kconfig.cputype
index 439c5ba,be852fd..548efa5
--- 1/arch/powerpc/platforms/Kconfig.cputype
--- 2/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@@ -129,20 -128,17 +129,19 @@@ config FSL_EMB_PERFMO
  
  config PTE_64BIT
        bool
 -      depends on 44x || E500
 -      default y if 44x
 -      default y if E500 && PHYS_64BIT
 +      depends on 44x || E500 || PPC_86xx
 +      default y if PHYS_64BIT
  
  config PHYS_64BIT
 -      bool 'Large physical address support' if E500
 -      depends on 44x || E500
 -      default y if 44x
 +      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 features is not be available on all e500 cores.
 +        addresses.  This feature may not be available on all cores.
 +
 +        If you have more than 3.5GB of RAM or so, you also need to enable
 +        SWIOTLB under Kernel Options for this to work.  The actual number
 +        is platform-dependent.
  
          If in doubt, say N here.
  

diff --cc arch/powerpc/sysdev/ppc4xx_pci.c
Simple merge

diff --cc arch/x86/Kconfig
index 7ccb6e6,837a9aa..bd3c2c5
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -933,9 -944,9 +933,8 @@@ config HIGHME
        depends on X86_32 && (HIGHMEM64G || HIGHMEM4G)
  
  config X86_PAE
 -      def_bool n
 -      prompt "PAE (Physical Address Extension) Support"
 +      bool "PAE (Physical Address Extension) Support"
        depends on X86_32 && !HIGHMEM4G
-       select RESOURCES_64BIT
        help
          PAE is required for NX support, and furthermore enables
          larger swapspace support for non-overcommit purposes. It

diff --cc include/linux/ioport.h
Simple merge

diff --cc include/linux/kernel.h
Simple merge

diff --cc kernel/printk.c
Simple merge

diff --cc kernel/resource.c
Simple merge

diff --cc mm/Kconfig
Simple merge

diff --cc mm/filemap.c
Simple merge