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
This commit is contained in:
@@ -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 */
|
||||
|
@@ -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)
|
||||
{
|
||||
|
@@ -35,7 +35,7 @@ SECTIONS
|
||||
_einittext = .;
|
||||
. = ALIGN(4);
|
||||
__tagtable_begin = .;
|
||||
*(.taglist)
|
||||
*(.taglist.init)
|
||||
__tagtable_end = .;
|
||||
*(.init.data)
|
||||
. = ALIGN(16);
|
||||
|
Reference in New Issue
Block a user