diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-31 17:10:03 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-31 17:10:03 +0100 |
| commit | eafa6cb18ec7e5424ce54017b5ce6d11dff58b79 (patch) | |
| tree | d930417cd7d252fe171663aecd9229d19d42aa99 /include | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | sh: Titan defconfig update. (diff) | |
| download | linux-eafa6cb18ec7e5424ce54017b5ce6d11dff58b79.tar.xz linux-eafa6cb18ec7e5424ce54017b5ce6d11dff58b79.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Titan defconfig update.
sh: Fix IPR-IRQ's for IRQ-chip change breakage.
sh: Update r7780rp_defconfig.
video: Fix include in hp680_bl.
sh: Wire up new syscalls.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sh/irq.h | 10 | ||||
| -rw-r--r-- | include/asm-sh/unistd.h | 5 |
2 files changed, 12 insertions, 3 deletions
diff --git a/include/asm-sh/irq.h b/include/asm-sh/irq.h index 7596ab83e0d4..6cd3e9e2a76a 100644 --- a/include/asm-sh/irq.h +++ b/include/asm-sh/irq.h @@ -327,11 +327,17 @@ extern unsigned short *irq_mask_register; */ void init_IRQ_pint(void); +struct ipr_data { + unsigned int irq; + unsigned int addr; /* Address of Interrupt Priority Register */ + int shift; /* Shifts of the 16-bit data */ + int priority; /* The priority */ +}; + /* * Function for "on chip support modules". */ -extern void make_ipr_irq(unsigned int irq, unsigned int addr, - int pos, int priority); +extern void make_ipr_irq(struct ipr_data *table, unsigned int nr_irqs); extern void make_imask_irq(unsigned int irq); #if defined(CONFIG_CPU_SUBTYPE_SH7300) diff --git a/include/asm-sh/unistd.h b/include/asm-sh/unistd.h index f1a0cbc966be..1c2abde122cd 100644 --- a/include/asm-sh/unistd.h +++ b/include/asm-sh/unistd.h @@ -324,8 +324,11 @@ #define __NR_sync_file_range 314 #define __NR_tee 315 #define __NR_vmsplice 316 +#define __NR_move_pages 317 +#define __NR_getcpu 318 +#define __NR_epoll_pwait 319 -#define NR_syscalls 317 +#define NR_syscalls 320 #ifdef __KERNEL__ |