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

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (408 commits)
  [POWERPC] Add memchr() to the bootwrapper
  [POWERPC] Implement logging of unhandled signals
  [POWERPC] Add legacy serial support for OPB with flattened device tree
  [POWERPC] Use 1TB segments
  [POWERPC] XilinxFB: Allow fixed framebuffer base address
  [POWERPC] XilinxFB: Add support for custom screen resolution
  [POWERPC] XilinxFB: Use pdata to pass around framebuffer parameters
  [POWERPC] PCI: Add 64-bit physical address support to setup_indirect_pci
  [POWERPC] 4xx: Kilauea defconfig file
  [POWERPC] 4xx: Kilauea DTS
  [POWERPC] 4xx: Add AMCC Kilauea eval board support to platforms/40x
  [POWERPC] 4xx: Add AMCC 405EX support to cputable.c
  [POWERPC] Adjust TASK_SIZE on ppc32 systems to 3GB that are capable
  [POWERPC] Use PAGE_OFFSET to tell if an address is user/kernel in SW TLB handlers
  [POWERPC] 85xx: Enable FP emulation in MPC8560 ADS defconfig
  [POWERPC] 85xx: Killed <asm/mpc85xx.h>
  [POWERPC] 85xx: Add cpm nodes for 8541/8555 CDS
  [POWERPC] 85xx: Convert mpc8560ads to the new CPM binding.
  [POWERPC] mpc8272ads: Remove muram from the CPM reg property.
  [POWERPC] Make clockevents work on PPC601 processors
  ...

Fixed up conflict in Documentation/powerpc/booting-without-of.txt manually.

1 files changed, 9 insertions, 0 deletions

diff --git a/include/asm-powerpc/ps3.h b/include/asm-powerpc/ps3.h
index a6f3f5ee7ca7..f577a16c6728 100644
--- a/include/asm-powerpc/ps3.h
+++ b/include/asm-powerpc/ps3.h
@@ -229,6 +229,9 @@ enum lv1_result {
         LV1_INVALID_CLASS_ID            = -21,
         LV1_CONSTRAINT_NOT_SATISFIED    = -22,
         LV1_ALIGNMENT_ERROR             = -23,
+        LV1_HARDWARE_ERROR              = -24,
+        LV1_INVALID_DATA_FORMAT         = -25,
+        LV1_INVALID_OPERATION           = -26,
         LV1_INTERNAL_ERROR              = -32768,
 };
 
@@ -284,6 +287,12 @@ static inline const char* ps3_result(int result)
                 return "LV1_CONSTRAINT_NOT_SATISFIED (-22)";
         case LV1_ALIGNMENT_ERROR:
                 return "LV1_ALIGNMENT_ERROR (-23)";
+        case LV1_HARDWARE_ERROR:
+                return "LV1_HARDWARE_ERROR (-24)";
+        case LV1_INVALID_DATA_FORMAT:
+                return "LV1_INVALID_DATA_FORMAT (-25)";
+        case LV1_INVALID_OPERATION:
+                return "LV1_INVALID_OPERATION (-26)";
         case LV1_INTERNAL_ERROR:
                 return "LV1_INTERNAL_ERROR (-32768)";
         default: