[POWERPC] spufs: Make isolated loader properly aligned

According to the comment in spufs_init_isolated_loader(), the isolated
loader should be aligned on a 16 byte boundary.
ARCH_{KMALLOC,SLAB}_MINALIGN is not defined so only 8 byte alignment is
guaranteed.

This enforces alignment via __get_free_pages.

Signed-off-by: Sebastian Siewior <sebastian@breakpoint.cc>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 6 insertions, 3 deletions

diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index b3d0dd118dd0..e210a4b259fb 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -43,6 +43,7 @@
 
 static struct kmem_cache *spufs_inode_cache;
 char *isolated_loader;
+static int isolated_loader_size;
 
 static struct inode *
 spufs_alloc_inode(struct super_block *sb)
@@ -667,7 +668,8 @@ spufs_parse_options(char *options, struct inode *root)
 
 static void spufs_exit_isolated_loader(void)
 {
-        kfree(isolated_loader);
+        free_pages((unsigned long) isolated_loader,
+                        get_order(isolated_loader_size));
 }
 
 static void
@@ -685,11 +687,12 @@ spufs_init_isolated_loader(void)
         if (!loader)
                 return;
 
-        /* kmalloc should align on a 16 byte boundary..* */
-        isolated_loader = kmalloc(size, GFP_KERNEL);
+        /* the loader must be align on a 16 byte boundary */
+        isolated_loader = (char *)__get_free_pages(GFP_KERNEL, get_order(size));
         if (!isolated_loader)
                 return;
 
+        isolated_loader_size = size;
         memcpy(isolated_loader, loader, size);
         printk(KERN_INFO "spufs: SPU isolation mode enabled\n");
 }