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

Pull AVR32 updates from Hans-Christian Noren Egtvedt.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
  avr32: wire up pkey syscalls
  AVR32-pio: Replace two seq_printf() calls by seq_puts() in pio_bank_show()
  AVR32-pio: Use seq_putc() in pio_bank_show()
  AVR32-clock: Combine nine seq_printf() calls into one call in clk_show()
  AVR32-clock: Use seq_putc() in two functions

diff --git a/arch/avr32/include/uapi/asm/unistd.h b/arch/avr32/include/uapi/asm/unistd.h
index 2c8a0d2b6c30b54fed09f3d363de235e45959ec3..236505d889d097f309f0051b1700cf831d1dd498 100644 (file)
--- a/arch/avr32/include/uapi/asm/unistd.h
+++ b/arch/avr32/include/uapi/asm/unistd.h
@@ -340,5 +340,8 @@
 #define __NR_copy_file_range    325
 #define __NR_preadv2            326
 #define __NR_pwritev2           327
+#define __NR_pkey_mprotect      328
+#define __NR_pkey_alloc         329
+#define __NR_pkey_free          330
 
 #endif /* _UAPI__ASM_AVR32_UNISTD_H */

diff --git a/arch/avr32/kernel/syscall_table.S b/arch/avr32/kernel/syscall_table.S
index 7b348ba70e41d2e0f1816f56732e72368a435e2c..774ce57f49482dfc3ea5e5ebad0216cae04def0d 100644 (file)
--- a/arch/avr32/kernel/syscall_table.S
+++ b/arch/avr32/kernel/syscall_table.S
@@ -341,4 +341,7 @@ sys_call_table:
        .long __sys_copy_file_range
        .long __sys_preadv2
        .long __sys_pwritev2
+       .long sys_pkey_mprotect
+       .long sys_pkey_alloc
+       .long sys_pkey_free /* 330 */
        .long sys_ni_syscall /* r8 is saturated at nr_syscalls */

diff --git a/arch/avr32/mach-at32ap/clock.c b/arch/avr32/mach-at32ap/clock.c
index 52c179bec0cc6c69d4430324a0a581f66e066a6d..fdf1caecb7b913617c28b022fede873d59450d52 100644 (file)
--- a/arch/avr32/mach-at32ap/clock.c
+++ b/arch/avr32/mach-at32ap/clock.c
@@ -242,7 +242,7 @@ dump_clock(struct clk *parent, struct clkinf *r)
                clk_get_rate(parent));
        if (parent->dev)
                seq_printf(r->s, ", for %s", dev_name(parent->dev));
-       seq_printf(r->s, "\n");
+       seq_putc(r->s, '\n');
 
        /* cost of this scan is small, but not linear... */
        r->nest = nest + NEST_DELTA;
@@ -261,23 +261,32 @@ static int clk_show(struct seq_file *s, void *unused)
        struct clk      *clk;
 
        /* show all the power manager registers */
-       seq_printf(s, "MCCTRL  = %8x\n", pm_readl(MCCTRL));
-       seq_printf(s, "CKSEL   = %8x\n", pm_readl(CKSEL));
-       seq_printf(s, "CPUMASK = %8x\n", pm_readl(CPU_MASK));
-       seq_printf(s, "HSBMASK = %8x\n", pm_readl(HSB_MASK));
-       seq_printf(s, "PBAMASK = %8x\n", pm_readl(PBA_MASK));
-       seq_printf(s, "PBBMASK = %8x\n", pm_readl(PBB_MASK));
-       seq_printf(s, "PLL0    = %8x\n", pm_readl(PLL0));
-       seq_printf(s, "PLL1    = %8x\n", pm_readl(PLL1));
-       seq_printf(s, "IMR     = %8x\n", pm_readl(IMR));
+       seq_printf(s,
+                  "MCCTRL  = %8x\n"
+                  "CKSEL   = %8x\n"
+                  "CPUMASK = %8x\n"
+                  "HSBMASK = %8x\n"
+                  "PBAMASK = %8x\n"
+                  "PBBMASK = %8x\n"
+                  "PLL0    = %8x\n"
+                  "PLL1    = %8x\n"
+                  "IMR     = %8x\n",
+                  pm_readl(MCCTRL),
+                  pm_readl(CKSEL),
+                  pm_readl(CPU_MASK),
+                  pm_readl(HSB_MASK),
+                  pm_readl(PBA_MASK),
+                  pm_readl(PBB_MASK),
+                  pm_readl(PLL0),
+                  pm_readl(PLL1),
+                  pm_readl(IMR));
        for (i = 0; i < 8; i++) {
                if (i == 5)
                        continue;
                seq_printf(s, "GCCTRL%d = %8x\n", i, pm_readl(GCCTRL(i)));
        }
 
-       seq_printf(s, "\n");
-
+       seq_putc(s, '\n');
        r.s = s;
        r.nest = 0;
        /* protected from changes on the list while dumping */

diff --git a/arch/avr32/mach-at32ap/pio.c b/arch/avr32/mach-at32ap/pio.c
index 13d3fc4270b7b4ab2f3bea5fb352b65f4e6e09db..7fae6ec7e8ecb58b24894a4e6437943bc09b4377 100644 (file)
--- a/arch/avr32/mach-at32ap/pio.c
+++ b/arch/avr32/mach-at32ap/pio.c
@@ -367,13 +367,13 @@ static void pio_bank_show(struct seq_file *s, struct gpio_chip *chip)
                        (mask & pdsr) ? "hi" : "lo",
                        (mask & pusr) ? "  " : "up");
                if (ifsr & mask)
-                       seq_printf(s, " deglitch");
+                       seq_puts(s, " deglitch");
                if ((osr & mdsr) & mask)
-                       seq_printf(s, " open-drain");
+                       seq_puts(s, " open-drain");
                if (imr & mask)
                        seq_printf(s, " irq-%d edge-both",
                                gpio_to_irq(chip->base + i));
-               seq_printf(s, "\n");
+               seq_putc(s, '\n');
        }
 }