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 /include | |
| parent | b0b73cb41d56ee391f20cbd3e4304e2303a8829b (diff) | |
| parent | 47cc3e780474be2e462278d63d77c27a493b28ed (diff) | |
| download | op-kernel-dev-3960208f9ca0cf6bdb31c21c59ac0526303f8b34.zip op-kernel-dev-3960208f9ca0cf6bdb31c21c59ac0526303f8b34.tar.gz | |
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 'include')
| -rw-r--r-- | include/asm-avr32/setup.h | 2 | ||||
| -rw-r--r-- | include/asm-avr32/unistd.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-avr32/setup.h b/include/asm-avr32/setup.h index 1ff1a21..b0828d4 100644 --- a/include/asm-avr32/setup.h +++ b/include/asm-avr32/setup.h @@ -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 } diff --git a/include/asm-avr32/unistd.h b/include/asm-avr32/unistd.h index 8f51204..2418cce 100644 --- a/include/asm-avr32/unistd.h +++ b/include/asm-avr32/unistd.h @@ -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 |
