mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
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:
commit
3960208f9c
8 changed files with 17 additions and 10 deletions
|
|
@ -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 }
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue