diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-16 21:20:28 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-16 21:20:28 -0700 |
commit | 36dbe4d6bffb90fcb2663ac50af00a942412e246 (patch) | |
tree | 4d24a2165620fa8fad0454299a8f5412555bba61 /include | |
parent | e0f88db3028798b5e6d62d1c65c991240bf317f3 (diff) | |
parent | d0a2b7af27f6d01a443f3af8252fa0b955bf1913 (diff) | |
download | kernel_samsung_espresso10-36dbe4d6bffb90fcb2663ac50af00a942412e246.zip kernel_samsung_espresso10-36dbe4d6bffb90fcb2663ac50af00a942412e246.tar.gz kernel_samsung_espresso10-36dbe4d6bffb90fcb2663ac50af00a942412e246.tar.bz2 |
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] Implement platform hooks for atmel_lcdfb driver
[AVR32] Wire up signalfd, timerfd and eventfd
[AVR32] optimize pagefault path
[AVR32] Remove bogus comment in arch/avr32/kernel/irq.c
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-avr32/arch-at32ap/board.h | 8 | ||||
-rw-r--r-- | include/asm-avr32/kdebug.h | 17 | ||||
-rw-r--r-- | include/asm-avr32/kprobes.h | 1 | ||||
-rw-r--r-- | include/asm-avr32/unistd.h | 5 |
4 files changed, 21 insertions, 10 deletions
diff --git a/include/asm-avr32/arch-at32ap/board.h b/include/asm-avr32/arch-at32ap/board.h index 1a7b07d..9fd2e32 100644 --- a/include/asm-avr32/arch-at32ap/board.h +++ b/include/asm-avr32/arch-at32ap/board.h @@ -30,11 +30,9 @@ struct spi_board_info; struct platform_device * at32_add_device_spi(unsigned int id, struct spi_board_info *b, unsigned int n); -struct lcdc_platform_data { - unsigned long fbmem_start; - unsigned long fbmem_size; -}; +struct atmel_lcdfb_info; struct platform_device * -at32_add_device_lcdc(unsigned int id, struct lcdc_platform_data *data); +at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data, + unsigned long fbmem_start, unsigned long fbmem_len); #endif /* __ASM_ARCH_BOARD_H */ diff --git a/include/asm-avr32/kdebug.h b/include/asm-avr32/kdebug.h index de41927..7f54e2b 100644 --- a/include/asm-avr32/kdebug.h +++ b/include/asm-avr32/kdebug.h @@ -5,13 +5,22 @@ /* Grossly misnamed. */ enum die_val { - DIE_FAULT, DIE_BREAKPOINT, DIE_SSTEP, - DIE_PAGE_FAULT, }; -int register_page_fault_notifier(struct notifier_block *nb); -int unregister_page_fault_notifier(struct notifier_block *nb); +/* + * These are only here because kprobes.c wants them to implement a + * blatant layering violation. Will hopefully go away soon once all + * architectures are updated. + */ +static inline int register_page_fault_notifier(struct notifier_block *nb) +{ + return 0; +} +static inline int unregister_page_fault_notifier(struct notifier_block *nb) +{ + return 0; +} #endif /* __ASM_AVR32_KDEBUG_H */ diff --git a/include/asm-avr32/kprobes.h b/include/asm-avr32/kprobes.h index 09a5cbe..190a637 100644 --- a/include/asm-avr32/kprobes.h +++ b/include/asm-avr32/kprobes.h @@ -26,6 +26,7 @@ struct arch_specific_insn { kprobe_opcode_t insn[MAX_INSN_SIZE]; }; +extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr); extern int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val, void *data); diff --git a/include/asm-avr32/unistd.h b/include/asm-avr32/unistd.h index 2418cce..3b4e35b 100644 --- a/include/asm-avr32/unistd.h +++ b/include/asm-avr32/unistd.h @@ -296,9 +296,12 @@ #define __NR_shmctl 277 #define __NR_utimensat 278 +#define __NR_signalfd 279 +#define __NR_timerfd 280 +#define __NR_eventfd 281 #ifdef __KERNEL__ -#define NR_syscalls 279 +#define NR_syscalls 282 #define __ARCH_WANT_IPC_PARSE_VERSION |