Merge branch 'sh/for-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* 'sh/for-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Provide a FLAT_PLAT_INIT() definition.
  binfmt_flat: Stub in a FLAT_PLAT_INIT().
  video: export sh_mobile_lcdc panel size
  sh: select memchunk size using kernel cmdline
  sh: export sh7723 VEU as VEU2H
  input: migor_ts compile and detection fix
  sh: remove MSTPCR defines from Migo-R header file
  sh: Update sh7763rdp defconfig
  sh: Add support sh7760fb to sh7763rdp board
  sh: Add support sh_eth to sh7763rdp board
  sh: Disable 64kB hugetlbpage size when using 64kB PAGE_SIZE.
  sh: Don't export __{s,u}divsi3_i4i from SH-2 libgcc.
  fix SH7705_CACHE_32KB compilation
  sh: mach-x3proto: Fix up smc91x platform data.

2 files changed, 29 insertions, 0 deletions

diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index 9c131cac91a4..8a03926ea84f 100644
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -181,10 +181,12 @@ config ENTRY_OFFSET
 choice
         prompt "HugeTLB page size"
         depends on HUGETLB_PAGE && (CPU_SH4 || CPU_SH5) && MMU
+        default HUGETLB_PAGE_SIZE_1MB if PAGE_SIZE_64KB
         default HUGETLB_PAGE_SIZE_64K
 
 config HUGETLB_PAGE_SIZE_64K
         bool "64kB"
+        depends on !PAGE_SIZE_64KB
 
 config HUGETLB_PAGE_SIZE_256K
         bool "256kB"
diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c
index b2ce014401b5..895bb3f335c7 100644
--- a/arch/sh/mm/consistent.c
+++ b/arch/sh/mm/consistent.c
@@ -95,6 +95,29 @@ void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
 }
 EXPORT_SYMBOL(dma_cache_sync);
 
+static int __init memchunk_setup(char *str)
+{
+        return 1; /* accept anything that begins with "memchunk." */
+}
+__setup("memchunk.", memchunk_setup);
+
+static void memchunk_cmdline_override(char *name, unsigned long *sizep)
+{
+        char *p = boot_command_line;
+        int k = strlen(name);
+
+        while ((p = strstr(p, "memchunk."))) {
+                p += 9; /* strlen("memchunk.") */
+                if (!strncmp(name, p, k) && p[k] == '=') {
+                        p += k + 1;
+                        *sizep = memparse(p, NULL);
+                        pr_info("%s: forcing memory chunk size to 0x%08lx\n",
+                                name, *sizep);
+                        break;
+                }
+        }
+}
+
 int platform_resource_setup_memory(struct platform_device *pdev,
                                    char *name, unsigned long memsize)
 {
@@ -109,6 +132,10 @@ int platform_resource_setup_memory(struct platform_device *pdev,
                 return -EINVAL;
         }
 
+        memchunk_cmdline_override(name, &memsize);
+        if (!memsize)
+                return 0;
+
         buf = dma_alloc_coherent(NULL, memsize, &dma_handle, GFP_KERNEL);
         if (!buf) {
                 pr_warning("%s: unable to allocate memory\n", name);