mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-07 22:08:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2007-05-16 21:20:28 -07:00
parent e0f88db302 d0a2b7af27
commit 36dbe4d6bf
12 changed files with 161 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/asm-avr32/arch-at32ap/board.h
View File

@@ -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 */

17
include/asm-avr32/kdebug.h
View File

@@ -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 */

1
include/asm-avr32/kprobes.h
View File

@@ -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);

5
include/asm-avr32/unistd.h
View File

@@ -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