diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 09:24:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 09:24:14 -0700 |
| commit | e430426654c6a99fb1977bae71d4844e876c4a52 (patch) | |
| tree | 65a22a59321b6bed5579c2e58371eeb373e1db61 /arch/parisc/include | |
| parent | e732ff707743e5ceba6ae2bfc7e799a0bac30ffa (diff) | |
| parent | 650a35f868f809aade56ef960d8a465f57ac74e2 (diff) | |
| download | talos-obmc-linux-e430426654c6a99fb1977bae71d4844e876c4a52.tar.gz talos-obmc-linux-e430426654c6a99fb1977bae71d4844e876c4a52.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
parisc: add tty driver to PDC console
drivers/parisc/iosapic.c: Remove unnecessary kzalloc cast
parisc: remove homegrown L1_CACHE_ALIGN macro
arch/parisc: Removing undead ifdef CONFIG_PA20
parisc: unwind - optimise linked-list searches for modules
parisc: change to new flag variable
drivers/char/agp/parisc-agp.c: eliminate memory leak
parisc: kill __do_IRQ
parisc: convert eisa interrupts to flow handlers
parisc: convert gsc and dino pci interrupts to flow handlers
parisc: convert suckyio interrupts to flow handlers
parisc: convert iosapic interrupts to proper flow handlers
parisc: convert cpu interrupts to proper flow handlers
parisc: lay groundwork for killing __do_IRQ
parisc: add prlimit64 syscall
parisc: squelch warning when using dev_get_stats
Diffstat (limited to 'arch/parisc/include')
| -rw-r--r-- | arch/parisc/include/asm/cache.h | 2 | ||||
| -rw-r--r-- | arch/parisc/include/asm/irq.h | 2 | ||||
| -rw-r--r-- | arch/parisc/include/asm/unistd.h | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h index 039880e7d2c9..47f11c707b65 100644 --- a/arch/parisc/include/asm/cache.h +++ b/arch/parisc/include/asm/cache.h @@ -24,8 +24,6 @@ #ifndef __ASSEMBLY__ -#define L1_CACHE_ALIGN(x) (((x)+(L1_CACHE_BYTES-1))&~(L1_CACHE_BYTES-1)) - #define SMP_CACHE_BYTES L1_CACHE_BYTES #define ARCH_DMA_MINALIGN L1_CACHE_BYTES diff --git a/arch/parisc/include/asm/irq.h b/arch/parisc/include/asm/irq.h index dfa26b67f919..c67dccf2e31f 100644 --- a/arch/parisc/include/asm/irq.h +++ b/arch/parisc/include/asm/irq.h @@ -40,7 +40,7 @@ struct irq_chip; void no_ack_irq(unsigned int irq); void no_end_irq(unsigned int irq); void cpu_ack_irq(unsigned int irq); -void cpu_end_irq(unsigned int irq); +void cpu_eoi_irq(unsigned int irq); extern int txn_alloc_irq(unsigned int nbits); extern int txn_claim_irq(int); diff --git a/arch/parisc/include/asm/unistd.h b/arch/parisc/include/asm/unistd.h index 1ce7d2851d90..3eb82c2a5ec3 100644 --- a/arch/parisc/include/asm/unistd.h +++ b/arch/parisc/include/asm/unistd.h @@ -813,8 +813,9 @@ #define __NR_perf_event_open (__NR_Linux + 318) #define __NR_recvmmsg (__NR_Linux + 319) #define __NR_accept4 (__NR_Linux + 320) +#define __NR_prlimit64 (__NR_Linux + 321) -#define __NR_Linux_syscalls (__NR_accept4 + 1) +#define __NR_Linux_syscalls (__NR_prlimit64 + 1) #define __IGNORE_select /* newselect */ |
