5 files changed, 44 insertions, 2 deletions

diff --git a/arch/powerpc/boot/ps3-head.S b/arch/powerpc/boot/ps3-head.S
index 1a6d64a68df5..a55c2735f759 100644
--- a/arch/powerpc/boot/ps3-head.S
+++ b/arch/powerpc/boot/ps3-head.S
@@ -20,6 +20,8 @@
 
 #include "ppc_asm.h"
 
+        .machine "ppc64"
+
         .text
 
 /*
diff --git a/arch/powerpc/boot/ps3-hvcall.S b/arch/powerpc/boot/ps3-hvcall.S
index c8b7df3210d1..585965f7e6a8 100644
--- a/arch/powerpc/boot/ps3-hvcall.S
+++ b/arch/powerpc/boot/ps3-hvcall.S
@@ -20,6 +20,8 @@
 
 #include "ppc_asm.h"
 
+        .machine "ppc64"
+
 /*
  * The PS3 hypervisor uses a 64 bit "C" language calling convention.
  * The routines here marshal arguments between the 32 bit wrapper
diff --git a/arch/powerpc/mm/tlb_32.c b/arch/powerpc/mm/tlb_32.c
index 06c7e77e097a..eb4b512d65fa 100644
--- a/arch/powerpc/mm/tlb_32.c
+++ b/arch/powerpc/mm/tlb_32.c
@@ -26,6 +26,8 @@
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/highmem.h>
+#include <linux/pagemap.h>
+
 #include <asm/tlbflush.h>
 #include <asm/tlb.h>
 
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index 7de4e919687b..4100ddc52f02 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -2177,8 +2177,8 @@ struct tree_descr spufs_dir_contents[] = {
         { "mbox_stat", &spufs_mbox_stat_fops, 0444, },
         { "ibox_stat", &spufs_ibox_stat_fops, 0444, },
         { "wbox_stat", &spufs_wbox_stat_fops, 0444, },
-        { "signal1", &spufs_signal1_fops, 0666, },
-        { "signal2", &spufs_signal2_fops, 0666, },
+        { "signal1", &spufs_signal1_nosched_fops, 0222, },
+        { "signal2", &spufs_signal2_nosched_fops, 0222, },
         { "signal1_type", &spufs_signal1_type, 0666, },
         { "signal2_type", &spufs_signal2_type, 0666, },
         { "cntl", &spufs_cntl_fops,  0666, },
diff --git a/arch/powerpc/platforms/ps3/Kconfig b/arch/powerpc/platforms/ps3/Kconfig
index a05079b07696..d4fc74f7bb15 100644
--- a/arch/powerpc/platforms/ps3/Kconfig
+++ b/arch/powerpc/platforms/ps3/Kconfig
@@ -102,4 +102,40 @@ config PS3_STORAGE
         depends on PPC_PS3
         tristate
 
+config PS3_DISK
+        tristate "PS3 Disk Storage Driver"
+        depends on PPC_PS3 && BLOCK
+        select PS3_STORAGE
+        help
+          Include support for the PS3 Disk Storage.
+
+          This support is required to access the PS3 hard disk.
+          In general, all users will say Y or M.
+
+config PS3_ROM
+        tristate "PS3 BD/DVD/CD-ROM Storage Driver"
+        depends on PPC_PS3 && SCSI
+        select PS3_STORAGE
+        help
+          Include support for the PS3 ROM Storage.
+
+          This support is required to access the PS3 BD/DVD/CD-ROM drive.
+          In general, all users will say Y or M.
+          Also make sure to say Y or M to "SCSI CDROM support" later.
+
+config PS3_FLASH
+        tristate "PS3 FLASH ROM Storage Driver"
+        depends on PPC_PS3
+        select PS3_STORAGE
+        help
+          Include support for the PS3 FLASH ROM Storage.
+
+          This support is required to access the PS3 FLASH ROM, which
+          contains the boot loader and some boot options.
+          In general, all users will say Y or M.
+
+          As this driver needs a fixed buffer of 256 KiB of memory, it can
+          be disabled on the kernel command line using "ps3flash=off", to
+          not allocate this fixed buffer.
+
 endmenu