Merge branch 'master'

6 files changed, 160 insertions, 22 deletions

diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
index 3d22ba2af01c..1b83e21841b5 100644
--- a/arch/sparc/kernel/Makefile
+++ b/arch/sparc/kernel/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_SUN_AUXIO) += auxio.o
 obj-$(CONFIG_PCI) += ebus.o
 obj-$(CONFIG_SUN_PM) += apc.o pmc.o
 obj-$(CONFIG_MODULES) += module.o sparc_ksyms.o
+obj-$(CONFIG_SPARC_LED) += led.o
 
 ifdef CONFIG_SUNOS_EMUL
 obj-y += sys_sunos.o sunos_ioctl.o
diff --git a/arch/sparc/kernel/cpu.c b/arch/sparc/kernel/cpu.c
index 6a4ebc62193e..d7bfc61d2879 100644
--- a/arch/sparc/kernel/cpu.c
+++ b/arch/sparc/kernel/cpu.c
@@ -75,7 +75,7 @@ struct cpu_fp_info linux_sparc_fpu[] = {
   { 9, 3, "Fujitsu or Weitek on-chip FPU"},
 };
 
-#define NSPARCFPU  (sizeof(linux_sparc_fpu)/sizeof(struct cpu_fp_info))
+#define NSPARCFPU  ARRAY_SIZE(linux_sparc_fpu)
 
 struct cpu_iu_info linux_sparc_chips[] = {
   /* Sun4/100, 4/200, SLC */
@@ -120,7 +120,7 @@ struct cpu_iu_info linux_sparc_chips[] = {
   { 0xf, 0, "UNKNOWN CPU-VENDOR/TYPE"},
 };
 
-#define NSPARCCHIPS  (sizeof(linux_sparc_chips)/sizeof(struct cpu_iu_info))
+#define NSPARCCHIPS  ARRAY_SIZE(linux_sparc_chips)
 
 char *sparc_cpu_type;
 char *sparc_fpu_type;
diff --git a/arch/sparc/kernel/led.c b/arch/sparc/kernel/led.c
new file mode 100644
index 000000000000..2a3afca453c9
--- /dev/null
+++ b/arch/sparc/kernel/led.c
@@ -0,0 +1,139 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/proc_fs.h>
+#include <linux/string.h>
+
+#include <asm/auxio.h>
+
+#define LED_MAX_LENGTH 8 /* maximum chars written to proc file */
+
+static inline void led_toggle(void)
+{
+        unsigned char val = get_auxio();
+        unsigned char on, off;
+
+        if (val & AUXIO_LED) {
+                on = 0;
+                off = AUXIO_LED;
+        } else {
+                on = AUXIO_LED;
+                off = 0;
+        }
+
+        set_auxio(on, off);
+}
+
+static struct timer_list led_blink_timer;
+
+static void led_blink(unsigned long timeout)
+{
+        led_toggle();
+
+        /* reschedule */
+        if (!timeout) { /* blink according to load */
+                led_blink_timer.expires = jiffies +
+                        ((1 + (avenrun[0] >> FSHIFT)) * HZ);
+                led_blink_timer.data = 0;
+        } else { /* blink at user specified interval */
+                led_blink_timer.expires = jiffies + (timeout * HZ);
+                led_blink_timer.data = timeout;
+        }
+        add_timer(&led_blink_timer);
+}
+
+static int led_read_proc(char *buf, char **start, off_t offset, int count,
+                         int *eof, void *data)
+{
+        int len = 0;
+
+        if (get_auxio() & AUXIO_LED)
+                len = sprintf(buf, "on\n");
+        else
+                len = sprintf(buf, "off\n");
+
+        return len;
+}
+
+static int led_write_proc(struct file *file, const char *buffer,
+                          unsigned long count, void *data)
+{
+        char *buf = NULL;
+
+        if (count > LED_MAX_LENGTH)
+                count = LED_MAX_LENGTH;
+
+        buf = kmalloc(sizeof(char) * (count + 1), GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+
+        if (copy_from_user(buf, buffer, count)) {
+                kfree(buf);
+                return -EFAULT;
+        }
+
+        buf[count] = '\0';
+
+        /* work around \n when echo'ing into proc */
+        if (buf[count - 1] == '\n')
+                buf[count - 1] = '\0';
+
+        /* before we change anything we want to stop any running timers,
+         * otherwise calls such as on will have no persistent effect
+         */
+        del_timer_sync(&led_blink_timer);
+
+        if (!strcmp(buf, "on")) {
+                auxio_set_led(AUXIO_LED_ON);
+        } else if (!strcmp(buf, "toggle")) {
+                led_toggle();
+        } else if ((*buf > '0') && (*buf <= '9')) {
+                led_blink(simple_strtoul(buf, NULL, 10));
+        } else if (!strcmp(buf, "load")) {
+                led_blink(0);
+        } else {
+                auxio_set_led(AUXIO_LED_OFF);
+        }
+
+        kfree(buf);
+
+        return count;
+}
+
+static struct proc_dir_entry *led;
+
+#define LED_VERSION     "0.1"
+
+static int __init led_init(void)
+{
+        init_timer(&led_blink_timer);
+        led_blink_timer.function = led_blink;
+
+        led = create_proc_entry("led", 0, NULL);
+        if (!led)
+                return -ENOMEM;
+
+        led->read_proc = led_read_proc; /* reader function */
+        led->write_proc = led_write_proc; /* writer function */
+        led->owner = THIS_MODULE;
+
+        printk(KERN_INFO
+               "led: version %s, Lars Kotthoff <metalhead@metalhead.ws>\n",
+               LED_VERSION);
+
+        return 0;
+}
+
+static void __exit led_exit(void)
+{
+        remove_proc_entry("led", NULL);
+        del_timer_sync(&led_blink_timer);
+}
+
+module_init(led_init);
+module_exit(led_exit);
+
+MODULE_AUTHOR("Lars Kotthoff <metalhead@metalhead.ws>");
+MODULE_DESCRIPTION("Provides control of the front LED on SPARC systems.");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(LED_VERSION);
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index 25e31d5ec99b..cccfc12802ed 100644
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -143,7 +143,7 @@ static struct pcic_ca2irq pcic_i_jk[] = {
  * as several PROMs may be installed on the same physical board.
  */
 #define SN2L_INIT(name, map)    \
-  { name, map, sizeof(map)/sizeof(struct pcic_ca2irq) }
+  { name, map, ARRAY_SIZE(map) }
 
 static struct pcic_sn2list pcic_known_sysnames[] = {
         SN2L_INIT("SUNW,JavaEngine1", pcic_i_je1a),     /* JE1, PROM 2.32 */
diff --git a/arch/sparc/kernel/process.c b/arch/sparc/kernel/process.c
index 29e72b57d4fd..ea8647411462 100644
--- a/arch/sparc/kernel/process.c
+++ b/arch/sparc/kernel/process.c
@@ -67,13 +67,6 @@ extern void fpsave(unsigned long *, unsigned long *, void *, unsigned long *);
 struct task_struct *last_task_used_math = NULL;
 struct thread_info *current_set[NR_CPUS];
 
-/*
- * default_idle is new in 2.5. XXX Review, currently stolen from sparc64.
- */
-void default_idle(void)
-{
-}
-
 #ifndef CONFIG_SMP
 
 #define SUN4C_FAULT_HIGH 100
@@ -92,12 +85,11 @@ void cpu_idle(void)
                         static unsigned long fps;
                         unsigned long now;
                         unsigned long faults;
-                        unsigned long flags;
 
                         extern unsigned long sun4c_kernel_faults;
                         extern void sun4c_grow_kernel_ring(void);
 
-                        local_irq_save(flags);
+                        local_irq_disable();
                         now = jiffies;
                         count -= (now - last_jiffies);
                         last_jiffies = now;
@@ -113,14 +105,19 @@ void cpu_idle(void)
                                         sun4c_grow_kernel_ring();
                                 }
                         }
-                        local_irq_restore(flags);
+                        local_irq_enable();
                 }
 
-                while((!need_resched()) && pm_idle) {
-                        (*pm_idle)();
+                if (pm_idle) {
+                        while (!need_resched())
+                                (*pm_idle)();
+                } else {
+                        while (!need_resched())
+                                cpu_relax();
                 }
-
+                preempt_enable_no_resched();
                 schedule();
+                preempt_disable();
                 check_pgt_cache();
         }
 }
@@ -130,13 +127,15 @@ void cpu_idle(void)
 /* This is being executed in task 0 'user space'. */
 void cpu_idle(void)
 {
+        set_thread_flag(TIF_POLLING_NRFLAG);
         /* endless idle loop with no priority at all */
         while(1) {
-                if(need_resched()) {
-                        schedule();
-                        check_pgt_cache();
-                }
-                barrier(); /* or else gcc optimizes... */
+                while (!need_resched())
+                        cpu_relax();
+                preempt_enable_no_resched();
+                schedule();
+                preempt_disable();
+                check_pgt_cache();
         }
 }
 
diff --git a/arch/sparc/kernel/sunos_ioctl.c b/arch/sparc/kernel/sunos_ioctl.c
index df1c0b31a930..a6ba3d26222c 100644
--- a/arch/sparc/kernel/sunos_ioctl.c
+++ b/arch/sparc/kernel/sunos_ioctl.c
@@ -23,7 +23,6 @@
 #include <linux/smp_lock.h>
 #include <linux/syscalls.h>
 #include <linux/file.h>
-#include <asm/kbio.h>
 
 #if 0
 extern char sunkbd_type;