aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-avr32
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-avr32')
-rw-r--r--include/asm-avr32/arch-at32ap/board.h8
-rw-r--r--include/asm-avr32/kdebug.h17
-rw-r--r--include/asm-avr32/kprobes.h1
-rw-r--r--include/asm-avr32/unistd.h5
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 1a7b07d436ff..9fd2e32f84b8 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;
30struct platform_device * 30struct platform_device *
31at32_add_device_spi(unsigned int id, struct spi_board_info *b, unsigned int n); 31at32_add_device_spi(unsigned int id, struct spi_board_info *b, unsigned int n);
32 32
33struct lcdc_platform_data { 33struct atmel_lcdfb_info;
34 unsigned long fbmem_start;
35 unsigned long fbmem_size;
36};
37struct platform_device * 34struct platform_device *
38at32_add_device_lcdc(unsigned int id, struct lcdc_platform_data *data); 35at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data,
36 unsigned long fbmem_start, unsigned long fbmem_len);
39 37
40#endif /* __ASM_ARCH_BOARD_H */ 38#endif /* __ASM_ARCH_BOARD_H */
diff --git a/include/asm-avr32/kdebug.h b/include/asm-avr32/kdebug.h
index de419278fc39..7f54e2b15d13 100644
--- a/include/asm-avr32/kdebug.h
+++ b/include/asm-avr32/kdebug.h
@@ -5,13 +5,22 @@
5 5
6/* Grossly misnamed. */ 6/* Grossly misnamed. */
7enum die_val { 7enum die_val {
8 DIE_FAULT,
9 DIE_BREAKPOINT, 8 DIE_BREAKPOINT,
10 DIE_SSTEP, 9 DIE_SSTEP,
11 DIE_PAGE_FAULT,
12}; 10};
13 11
14int register_page_fault_notifier(struct notifier_block *nb); 12/*
15int unregister_page_fault_notifier(struct notifier_block *nb); 13 * These are only here because kprobes.c wants them to implement a
14 * blatant layering violation. Will hopefully go away soon once all
15 * architectures are updated.
16 */
17static inline int register_page_fault_notifier(struct notifier_block *nb)
18{
19 return 0;
20}
21static inline int unregister_page_fault_notifier(struct notifier_block *nb)
22{
23 return 0;
24}
16 25
17#endif /* __ASM_AVR32_KDEBUG_H */ 26#endif /* __ASM_AVR32_KDEBUG_H */
diff --git a/include/asm-avr32/kprobes.h b/include/asm-avr32/kprobes.h
index 09a5cbe2f896..190a6377c809 100644
--- a/include/asm-avr32/kprobes.h
+++ b/include/asm-avr32/kprobes.h
@@ -26,6 +26,7 @@ struct arch_specific_insn {
26 kprobe_opcode_t insn[MAX_INSN_SIZE]; 26 kprobe_opcode_t insn[MAX_INSN_SIZE];
27}; 27};
28 28
29extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr);
29extern int kprobe_exceptions_notify(struct notifier_block *self, 30extern int kprobe_exceptions_notify(struct notifier_block *self,
30 unsigned long val, void *data); 31 unsigned long val, void *data);
31 32
diff --git a/include/asm-avr32/unistd.h b/include/asm-avr32/unistd.h
index 2418cce624cc..3b4e35b55c82 100644
--- a/include/asm-avr32/unistd.h
+++ b/include/asm-avr32/unistd.h
@@ -296,9 +296,12 @@
296#define __NR_shmctl 277 296#define __NR_shmctl 277
297 297
298#define __NR_utimensat 278 298#define __NR_utimensat 278
299#define __NR_signalfd 279
300#define __NR_timerfd 280
301#define __NR_eventfd 281
299 302
300#ifdef __KERNEL__ 303#ifdef __KERNEL__
301#define NR_syscalls 279 304#define NR_syscalls 282
302 305
303 306
304#define __ARCH_WANT_IPC_PARSE_VERSION 307#define __ARCH_WANT_IPC_PARSE_VERSION