[linuxsh-cvs] CVS: linux/arch/sh/kernel/cpu init.c,1.11,1.12

[Paul M. <le...@us...>]

Update of /cvsroot/linuxsh/linux/arch/sh/kernel/cpu
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21293/arch/sh/kernel/cpu

Modified Files:
	init.c 
Log Message:
Set the SHM alignment at runtime, based off of probed cache desc.
Optimize get_unmapped_area() to only colour align shared mappings.



Index: init.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/cpu/init.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- init.c	5 Jul 2006 08:46:48 -0000	1.11
+++ init.c	30 Aug 2006 09:56:49 -0000	1.12
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <asm/processor.h>
 #include <asm/uaccess.h>
+#include <asm/page.h>
 #include <asm/system.h>
 #include <asm/cacheflush.h>
 #include <asm/cache.h>
@@ -198,6 +199,10 @@
 	/* Init the cache */
 	cache_init();
 
+	shm_align_mask = max_t(unsigned long,
+			       cpu_data->dcache.way_size - 1,
+			       PAGE_SIZE - 1);
+
 	/* Disable the FPU */
 	if (fpu_disabled) {
 		printk("FPU Disabled\n");