diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 12:50:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 12:50:25 -0700 |
| commit | 3960208f9ca0cf6bdb31c21c59ac0526303f8b34 (patch) | |
| tree | ca1948cec8fb390e5298498361194db145e2e49f /arch/avr32/kernel | |
| parent | b0b73cb41d56ee391f20cbd3e4304e2303a8829b (diff) | |
| parent | 47cc3e780474be2e462278d63d77c27a493b28ed (diff) | |
| download | blackbird-op-linux-3960208f9ca0cf6bdb31c21c59ac0526303f8b34.tar.gz blackbird-op-linux-3960208f9ca0cf6bdb31c21c59ac0526303f8b34.zip | |
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
Diffstat (limited to 'arch/avr32/kernel')
| -rw-r--r-- | arch/avr32/kernel/syscall_table.S | 1 | ||||
| -rw-r--r-- | arch/avr32/kernel/traps.c | 2 | ||||
| -rw-r--r-- | arch/avr32/kernel/vmlinux.lds.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/arch/avr32/kernel/syscall_table.S b/arch/avr32/kernel/syscall_table.S index 7c279586fbba..07f6a6fa340d 100644 --- a/arch/avr32/kernel/syscall_table.S +++ b/arch/avr32/kernel/syscall_table.S @@ -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 */ diff --git a/arch/avr32/kernel/traps.c b/arch/avr32/kernel/traps.c index 4de9edf96ed2..86d107511dd4 100644 --- a/arch/avr32/kernel/traps.c +++ b/arch/avr32/kernel/traps.c @@ -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) { diff --git a/arch/avr32/kernel/vmlinux.lds.c b/arch/avr32/kernel/vmlinux.lds.c index 7ad20cfb48a8..e7f72c995a32 100644 --- a/arch/avr32/kernel/vmlinux.lds.c +++ b/arch/avr32/kernel/vmlinux.lds.c @@ -35,7 +35,7 @@ SECTIONS _einittext = .; . = ALIGN(4); __tagtable_begin = .; - *(.taglist) + *(.taglist.init) __tagtable_end = .; *(.init.data) . = ALIGN(16); |
