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:
Linus Torvalds 2007-05-09 12:50:25 -07:00
commit 3960208f9c
8 changed files with 17 additions and 10 deletions

View file

@ -110,7 +110,7 @@ struct tagtable {
int (*parse)(struct tag *);
};
#define __tag __attribute_used__ __attribute__((__section__(".taglist")))
#define __tag __attribute_used__ __attribute__((__section__(".taglist.init")))
#define __tagtable(tag, fn) \
static struct tagtable __tagtable_##fn __tag = { tag, fn }

View file

@ -295,8 +295,10 @@
#define __NR_shmdt 276
#define __NR_shmctl 277
#define __NR_utimensat 278
#ifdef __KERNEL__
#define NR_syscalls 278
#define NR_syscalls 279
#define __ARCH_WANT_IPC_PARSE_VERSION