Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc

diff --combined arch/powerpc/Kconfig
index f524b3bf68c895d3829d0a0b71afd0ebd3393e80,0b2d05da89d7dfdd9aef89bd79f3bc4fbbc307c2..a35212b7346e63982fa6954c9426ff36b24ccd80
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -470,7 -470,6 +470,7 @@@ config PPC_MAPL
        select PPC_UDBG_16550
        select PPC_970_NAP
        select PPC_NATIVE
 +      select PPC_RTAS
        default n
        help
            This option enables support for the Maple 970FX Evaluation Board.
@@@ -707,7 -706,7 +707,7 @@@ config FORCE_MAX_ZONEORDE
  
  config MATH_EMULATION
        bool "Math emulation"
-       depends on 4xx || 8xx || E200 || E500
+       depends on 4xx || 8xx || E200 || PPC_83xx || E500
        ---help---
          Some PowerPC chips designed for embedded applications do not have
          a floating-point unit and therefore do not implement the

diff --combined include/asm-powerpc/cputable.h
index 782adbf1f7aae92d584878f9ed870922de10c6ad,aca72f90849ee48b41ee49a76afab1ebfbf3fdc4..7384b8086b75411e2bc001f60184e344e42b31cf
--- 1/include/asm-powerpc/cputable.h
--- 2/include/asm-powerpc/cputable.h
+++ b/include/asm-powerpc/cputable.h
@@@ -126,6 -126,7 +126,7 @@@ extern void do_feature_fixups(unsigned 
  #define CPU_FTR_NODSISRALIGN          ASM_CONST(0x0000000000100000)
  #define CPU_FTR_PPC_LE                        ASM_CONST(0x0000000000200000)
  #define CPU_FTR_REAL_LE                       ASM_CONST(0x0000000000400000)
+ #define CPU_FTR_FPU_UNAVAILABLE               ASM_CONST(0x0000000000800000)
  
  /*
   * Add the 64-bit processor unique features in the top half of the word;
@@@ -152,7 -153,6 +153,7 @@@
  #define CPU_FTR_PURR                  LONG_ASM_CONST(0x0000400000000000)
  #define CPU_FTR_CELL_TB_BUG           LONG_ASM_CONST(0x0000800000000000)
  #define CPU_FTR_SPURR                 LONG_ASM_CONST(0x0001000000000000)
 +#define CPU_FTR_DSCR                  LONG_ASM_CONST(0x0002000000000000)
  
  #ifndef __ASSEMBLY__
  
@@@ -296,6 -296,9 +297,9 @@@
  #define CPU_FTRS_E300 (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_MAYBE_CAN_DOZE | \
            CPU_FTR_USE_TB | CPU_FTR_MAYBE_CAN_NAP | CPU_FTR_HAS_HIGH_BATS | \
            CPU_FTR_COMMON)
+ #define CPU_FTRS_E300C2       (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_MAYBE_CAN_DOZE | \
+           CPU_FTR_USE_TB | CPU_FTR_MAYBE_CAN_NAP | CPU_FTR_HAS_HIGH_BATS | \
+           CPU_FTR_COMMON | CPU_FTR_FPU_UNAVAILABLE)
  #define CPU_FTRS_CLASSIC32    (CPU_FTR_COMMON | CPU_FTR_SPLIT_ID_CACHE | \
            CPU_FTR_USE_TB | CPU_FTR_HPTE_TABLE)
  #define CPU_FTRS_8XX  (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB)
@@@ -331,14 -334,13 +335,14 @@@
            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
            CPU_FTR_MMCRA | CPU_FTR_SMT | \
            CPU_FTR_COHERENT_ICACHE | CPU_FTR_LOCKLESS_TLBIE | \
 -          CPU_FTR_PURR | CPU_FTR_SPURR | CPU_FTR_REAL_LE)
 +          CPU_FTR_PURR | CPU_FTR_SPURR | CPU_FTR_REAL_LE | \
 +          CPU_FTR_DSCR)
  #define CPU_FTRS_POWER6X (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \
            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
            CPU_FTR_MMCRA | CPU_FTR_SMT | \
            CPU_FTR_COHERENT_ICACHE | CPU_FTR_LOCKLESS_TLBIE | \
            CPU_FTR_PURR | CPU_FTR_CI_LARGE_PAGE | \
 -          CPU_FTR_SPURR | CPU_FTR_REAL_LE)
 +          CPU_FTR_SPURR | CPU_FTR_REAL_LE | CPU_FTR_DSCR)
  #define CPU_FTRS_CELL (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \
            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
            CPU_FTR_ALTIVEC_COMP | CPU_FTR_MMCRA | CPU_FTR_SMT | \
@@@ -366,7 -368,8 +370,8 @@@ enum 
            CPU_FTRS_7450_21 | CPU_FTRS_7450_23 | CPU_FTRS_7455_1 |
            CPU_FTRS_7455_20 | CPU_FTRS_7455 | CPU_FTRS_7447_10 |
            CPU_FTRS_7447 | CPU_FTRS_7447A | CPU_FTRS_82XX |
-           CPU_FTRS_G2_LE | CPU_FTRS_E300 | CPU_FTRS_CLASSIC32 |
+           CPU_FTRS_G2_LE | CPU_FTRS_E300 | CPU_FTRS_E300C2 |
+           CPU_FTRS_CLASSIC32 |
  #else
            CPU_FTRS_GENERIC_32 |
  #endif
@@@ -405,7 -408,8 +410,8 @@@ enum 
            CPU_FTRS_7450_21 & CPU_FTRS_7450_23 & CPU_FTRS_7455_1 &
            CPU_FTRS_7455_20 & CPU_FTRS_7455 & CPU_FTRS_7447_10 &
            CPU_FTRS_7447 & CPU_FTRS_7447A & CPU_FTRS_82XX &
-           CPU_FTRS_G2_LE & CPU_FTRS_E300 & CPU_FTRS_CLASSIC32 &
+           CPU_FTRS_G2_LE & CPU_FTRS_E300 & CPU_FTRS_E300C2 &
+           CPU_FTRS_CLASSIC32 &
  #else
            CPU_FTRS_GENERIC_32 &
  #endif