Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: export clk_* symbols in clk.c
  m68knommu: Split the .init section into INIT_TEXT_SECTION and INIT_DATA_SECTION.
  m68knommu: Move __init_end out of the .init section.
  m68knommu: Move __init_begin out of the .init section.
  m68knommu: Use more macros inside the .init section.
  m68knommu: Use INIT_TASK_DATA and CACHELINE_ALIGNED_DATA.
  m68knommu: Make THREAD_SIZE available to assembly files.
  m68knommu: Don't hardcode the value of PAGE_SIZE in the linker script.
  m68knommu: rename BSS define in linker script
  m68knommu: add a task_pt_regs() macro
  m68knommu: define arch_has_single_step() and friends
  m68knommu: add uboot commandline argument passing support
  m68knommu: Coldfire GPIO corrections
  m68knommu: move mcf_remove to .devexit.text

Fixed up (?) conflict in arch/m68k/include/asm/ptrace.h

5 files changed, 24 insertions, 6 deletions

diff --git a/arch/m68knommu/platform/523x/gpio.c b/arch/m68knommu/platform/523x/gpio.c
index f02840d54d3c..a8842dc27839 100644
--- a/arch/m68knommu/platform/523x/gpio.c
+++ b/arch/m68knommu/platform/523x/gpio.c
@@ -30,7 +30,8 @@ static struct mcf_gpio_chip mcf_gpio_chips[] = {
                         .direction_output       = mcf_gpio_direction_output,
                         .get                    = mcf_gpio_get_value,
                         .set                    = mcf_gpio_set_value,
-                        .ngpio                  = 8,
+                        .base                   = 1,
+                        .ngpio                  = 7,
                 },
                 .pddr                           = MCFEPORT_EPDDR,
                 .podr                           = MCFEPORT_EPDR,
@@ -244,7 +245,7 @@ static struct mcf_gpio_chip mcf_gpio_chips[] = {
                         .get                    = mcf_gpio_get_value,
                         .set                    = mcf_gpio_set_value_fast,
                         .base                   = 96,
-                        .ngpio                  = 4,
+                        .ngpio                  = 8,
                 },
                 .pddr                           = MCFGPIO_PDDR_TIMER,
                 .podr                           = MCFGPIO_PODR_TIMER,
diff --git a/arch/m68knommu/platform/527x/gpio.c b/arch/m68knommu/platform/527x/gpio.c
index 1028142851ac..0b56e19db0f8 100644
--- a/arch/m68knommu/platform/527x/gpio.c
+++ b/arch/m68knommu/platform/527x/gpio.c
@@ -31,7 +31,8 @@ static struct mcf_gpio_chip mcf_gpio_chips[] = {
                         .direction_output       = mcf_gpio_direction_output,
                         .get                    = mcf_gpio_get_value,
                         .set                    = mcf_gpio_set_value,
-                        .ngpio                  = 8,
+                        .base                   = 1,
+                        .ngpio                  = 7,
                 },
                 .pddr                           = MCFEPORT_EPDDR,
                 .podr                           = MCFEPORT_EPDR,
@@ -263,7 +264,8 @@ static struct mcf_gpio_chip mcf_gpio_chips[] = {
                         .direction_output       = mcf_gpio_direction_output,
                         .get                    = mcf_gpio_get_value,
                         .set                    = mcf_gpio_set_value,
-                        .ngpio                  = 8,
+                        .base                   = 1,
+                        .ngpio                  = 7,
                 },
                 .pddr                           = MCFEPORT_EPDDR,
                 .podr                           = MCFEPORT_EPDR,
diff --git a/arch/m68knommu/platform/528x/gpio.c b/arch/m68knommu/platform/528x/gpio.c
index ec593950696a..eedaf0adbcd7 100644
--- a/arch/m68knommu/platform/528x/gpio.c
+++ b/arch/m68knommu/platform/528x/gpio.c
@@ -31,7 +31,7 @@ static struct mcf_gpio_chip mcf_gpio_chips[] = {
                         .get                    = mcf_gpio_get_value,
                         .set                    = mcf_gpio_set_value,
                         .base                   = 1,
-                        .ngpio                  = 8,
+                        .ngpio                  = 7,
                 },
                 .pddr                           = MCFEPORT_EPDDR,
                 .podr                           = MCFEPORT_EPDR,
diff --git a/arch/m68knommu/platform/coldfire/clk.c b/arch/m68knommu/platform/coldfire/clk.c
index 7cdbf445b28f..9f1260c5e2ad 100644
--- a/arch/m68knommu/platform/coldfire/clk.c
+++ b/arch/m68knommu/platform/coldfire/clk.c
@@ -9,6 +9,7 @@
 /***************************************************************************/
 
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/clk.h>
 #include <asm/coldfire.h>
 
@@ -18,23 +19,27 @@ struct clk *clk_get(struct device *dev, const char *id)
 {
         return NULL;
 }
+EXPORT_SYMBOL(clk_get);
 
 int clk_enable(struct clk *clk)
 {
         return 0;
 }
+EXPORT_SYMBOL(clk_enable);
 
 void clk_disable(struct clk *clk)
 {
 }
+EXPORT_SYMBOL(clk_disable);
 
 void clk_put(struct clk *clk)
 {
 }
+EXPORT_SYMBOL(clk_put);
 
 unsigned long clk_get_rate(struct clk *clk)
 {
         return MCF_CLK;
 }
-
+EXPORT_SYMBOL(clk_get_rate);
 /***************************************************************************/
diff --git a/arch/m68knommu/platform/coldfire/head.S b/arch/m68knommu/platform/coldfire/head.S
index 2b0d73c0cc32..4b91aa24eb00 100644
--- a/arch/m68knommu/platform/coldfire/head.S
+++ b/arch/m68knommu/platform/coldfire/head.S
@@ -106,6 +106,9 @@
 .global _ramvec
 .global _ramstart
 .global _ramend
+#if defined(CONFIG_UBOOT)
+.global _init_sp
+#endif
 
 /*****************************************************************************/
 
@@ -124,6 +127,10 @@ _ramstart:
 .long   0
 _ramend:
 .long   0
+#if defined(CONFIG_UBOOT)
+_init_sp:
+.long   0
+#endif
 
 /*****************************************************************************/
 
@@ -137,6 +144,9 @@ __HEAD
 _start:
         nop                                     /* filler */
         movew   #0x2700, %sr                    /* no interrupts */
+#if defined(CONFIG_UBOOT)
+        movel   %sp,_init_sp                    /* save initial stack pointer */
+#endif
 
         /*
          *      Do any platform or board specific setup now. Most boards