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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Finally remove leftover markers sections
  m68k/mac: Fix mac_irq_pending() for PSC MACE and SCC
  m68k/mac: Fix compiler warning in via_read_time()
  zorro: Fix four checkpatch warnings

5 files changed, 28 insertions, 24 deletions

diff --git a/arch/m68k/kernel/vmlinux.lds_no.S b/arch/m68k/kernel/vmlinux.lds_no.S
index 7dc4087a9545..4e2389340837 100644
--- a/arch/m68k/kernel/vmlinux.lds_no.S
+++ b/arch/m68k/kernel/vmlinux.lds_no.S
@@ -77,7 +77,6 @@ SECTIONS {
 
                 *(.rodata) *(.rodata.*)
                 *(__vermagic)           /* Kernel version magic */
-                *(__markers_strings)
                 *(.rodata1)
                 *(.rodata.str1.1)
 
diff --git a/arch/m68k/mac/macints.c b/arch/m68k/mac/macints.c
index 900d899f3323..f92190c159b4 100644
--- a/arch/m68k/mac/macints.c
+++ b/arch/m68k/mac/macints.c
@@ -370,7 +370,7 @@ int mac_irq_pending(unsigned int irq)
                 break;
         case 4:
                 if (psc_present)
-                        psc_irq_pending(irq);
+                        return psc_irq_pending(irq);
                 break;
         }
         return 0;
diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c
index e023fc6b37e5..eb915551de69 100644
--- a/arch/m68k/mac/misc.c
+++ b/arch/m68k/mac/misc.c
@@ -304,35 +304,41 @@ static void via_write_pram(int offset, __u8 data)
 static long via_read_time(void)
 {
         union {
-                __u8  cdata[4];
-                long  idata;
+                __u8 cdata[4];
+                long idata;
         } result, last_result;
-        int     ct;
+        int count = 1;
+
+        via_pram_command(0x81, &last_result.cdata[3]);
+        via_pram_command(0x85, &last_result.cdata[2]);
+        via_pram_command(0x89, &last_result.cdata[1]);
+        via_pram_command(0x8D, &last_result.cdata[0]);
 
         /*
          * The NetBSD guys say to loop until you get the same reading
          * twice in a row.
          */
 
-        ct = 0;
-        do {
-                if (++ct > 10) {
-                        printk("via_read_time: couldn't get valid time, "
-                               "last read = 0x%08lx and 0x%08lx\n",
-                               last_result.idata, result.idata);
-                        break;
-                }
-
-                last_result.idata = result.idata;
-                result.idata = 0;
-
+        while (1) {
                 via_pram_command(0x81, &result.cdata[3]);
                 via_pram_command(0x85, &result.cdata[2]);
                 via_pram_command(0x89, &result.cdata[1]);
                 via_pram_command(0x8D, &result.cdata[0]);
-        } while (result.idata != last_result.idata);
 
-        return result.idata - RTC_OFFSET;
+                if (result.idata == last_result.idata)
+                        return result.idata - RTC_OFFSET;
+
+                if (++count > 10)
+                        break;
+
+                last_result.idata = result.idata;
+        }
+
+        pr_err("via_read_time: failed to read a stable value; "
+               "got 0x%08lx then 0x%08lx\n",
+               last_result.idata, result.idata);
+
+        return 0;
 }
 
 /*
diff --git a/drivers/zorro/zorro-driver.c b/drivers/zorro/zorro-driver.c
index 7ee2b6e71786..229624f867d3 100644
--- a/drivers/zorro/zorro-driver.c
+++ b/drivers/zorro/zorro-driver.c
@@ -37,6 +37,7 @@ zorro_match_device(const struct zorro_device_id *ids,
         }
         return NULL;
 }
+EXPORT_SYMBOL(zorro_match_device);
 
 
 static int zorro_device_probe(struct device *dev)
@@ -91,6 +92,7 @@ int zorro_register_driver(struct zorro_driver *drv)
         /* register with core */
         return driver_register(&drv->driver);
 }
+EXPORT_SYMBOL(zorro_register_driver);
 
 
     /**
@@ -107,6 +109,7 @@ void zorro_unregister_driver(struct zorro_driver *drv)
 {
         driver_unregister(&drv->driver);
 }
+EXPORT_SYMBOL(zorro_unregister_driver);
 
 
     /**
@@ -168,6 +171,7 @@ struct bus_type zorro_bus_type = {
         .probe  = zorro_device_probe,
         .remove = zorro_device_remove,
 };
+EXPORT_SYMBOL(zorro_bus_type);
 
 
 static int __init zorro_driver_init(void)
@@ -177,7 +181,3 @@ static int __init zorro_driver_init(void)
 
 postcore_initcall(zorro_driver_init);
 
-EXPORT_SYMBOL(zorro_match_device);
-EXPORT_SYMBOL(zorro_register_driver);
-EXPORT_SYMBOL(zorro_unregister_driver);
-EXPORT_SYMBOL(zorro_bus_type);
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index db22d136ad08..b5e2e4c6b017 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -222,7 +222,6 @@
                 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .;         \
                 *(__tracepoints_ptrs)   /* Tracepoints: pointer array */\
                 VMLINUX_SYMBOL(__stop___tracepoints_ptrs) = .;          \
-                *(__markers_strings)    /* Markers: strings */          \
                 *(__tracepoints_strings)/* Tracepoints: strings */      \
         }                                                               \
                                                                         \