Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3960208f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32 

* 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32:
  [AVR32] Wire up sys_utimensat
  [AVR32] Fix section mismatch .taglist -> .init.text
  [AVR32] Implement dma_{alloc,free}_writecombine()
  AVR32: Spinlock initializer cleanup
  [AVR32] Use correct config symbol when setting cpuflags
parents b0b73cb4 47cc3e78

arch/avr32/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ AFLAGS += -mrelax -mno-pic 
CFLAGS_MODULE	+= -mno-relax

LDFLAGS_vmlinux	+= --relax



cpuflags-$(CONFIG_CPU_AP7000)	+= -mcpu=ap7000

cpuflags-$(CONFIG_CPU_AT32AP7000)	+= -mcpu=ap7000



CFLAGS		+= $(cpuflags-y)

AFLAGS		+= $(cpuflags-y)

arch/avr32/kernel/syscall_table.S

+1 −0
Original line number Diff line number Diff line
@@ -291,4 +291,5 @@ sys_call_table: 
	.long	sys_shmget		/* 275 */

	.long	sys_shmdt

	.long	sys_shmctl

	.long	sys_utimensat

	.long	sys_ni_syscall		/* r8 is saturated at nr_syscalls */

arch/avr32/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ asmlinkage void do_address_exception(unsigned long ecr, struct pt_regs *regs) 


/* This way of handling undefined instructions is stolen from ARM */

static LIST_HEAD(undef_hook);

static spinlock_t undef_lock = SPIN_LOCK_UNLOCKED;

static DEFINE_SPINLOCK(undef_lock);



void register_undef_hook(struct undef_hook *hook)

{

arch/avr32/kernel/vmlinux.lds.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ SECTIONS 
			_einittext = .;

		. = ALIGN(4);

		__tagtable_begin = .;

			*(.taglist)

			*(.taglist.init)

		__tagtable_end = .;

			*(.init.data)

		. = ALIGN(16);

arch/avr32/mach-at32ap/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


#include "clock.h"



static spinlock_t clk_lock = SPIN_LOCK_UNLOCKED;

static DEFINE_SPINLOCK(clk_lock);



struct clk *clk_get(struct device *dev, const char *id)

{