Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 385c51d6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  agp: parisc-agp.c - use correct page_mask function
  parisc: Fix linker script breakage.
  parisc: convert to asm-generic/hardirq.h
  parisc: Make THREAD_SIZE available to assembly files and linker scripts.
  parisc: correct use of SHF_ALLOC
  parisc: rename parisc's vmalloc_start to parisc_vmalloc_start
  parisc: add me to Maintainers
  parisc: includecheck fix: signal.c
  parisc: HAVE_ARCH_TRACEHOOK
  parisc: add skeleton syscall.h
  parisc: stop using task->ptrace for {single,block}step flags
  parisc: split syscall_trace into two halves
  parisc: add missing TI_TASK macro in syscall.S
  parisc: tracehook_signal_handler
  parisc: tracehook_report_syscall
parents d82e23dc 4ef8774c

MAINTAINERS

+1 −0
Original line number Original line Diff line number Diff line
@@ -3973,6 +3973,7 @@ F: drivers/block/paride/ 
PARISC ARCHITECTURE

PARISC ARCHITECTURE

M:	Kyle McMartin <kyle@mcmartin.ca>

M:	Kyle McMartin <kyle@mcmartin.ca>

M:	Helge Deller <deller@gmx.de>

M:	Helge Deller <deller@gmx.de>

M:	"James E.J. Bottomley" <jejb@parisc-linux.org>

L:	linux-parisc@vger.kernel.org

L:	linux-parisc@vger.kernel.org

W:	http://www.parisc-linux.org/

W:	http://www.parisc-linux.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git

arch/parisc/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ config PARISC 
	select BUG

	select BUG

	select HAVE_PERF_EVENTS

	select HAVE_PERF_EVENTS

	select GENERIC_ATOMIC64 if !64BIT

	select GENERIC_ATOMIC64 if !64BIT

	select HAVE_ARCH_TRACEHOOK

	help

	help

	  The PA-RISC microprocessor is designed by Hewlett-Packard and used

	  The PA-RISC microprocessor is designed by Hewlett-Packard and used

	  in many of their workstations & servers (HP9000 700 and 800 series,

	  in many of their workstations & servers (HP9000 700 and 800 series,

arch/parisc/include/asm/fixmap.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -21,9 +21,9 @@ 
#define KERNEL_MAP_END		(TMPALIAS_MAP_START)

#define KERNEL_MAP_END		(TMPALIAS_MAP_START)





#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__

extern void *vmalloc_start;

extern void *parisc_vmalloc_start;

#define PCXL_DMA_MAP_SIZE	(8*1024*1024)

#define PCXL_DMA_MAP_SIZE	(8*1024*1024)

#define VMALLOC_START		((unsigned long)vmalloc_start)

#define VMALLOC_START		((unsigned long)parisc_vmalloc_start)

#define VMALLOC_END		(KERNEL_MAP_END)

#define VMALLOC_END		(KERNEL_MAP_END)

#endif /*__ASSEMBLY__*/

#endif /*__ASSEMBLY__*/

arch/parisc/include/asm/hardirq.h

+1 −19
Original line number Original line Diff line number Diff line 
/* hardirq.h: PA-RISC hard IRQ support.

/* hardirq.h: PA-RISC hard IRQ support.

 *

 *

 * Copyright (C) 2001 Matthew Wilcox <matthew@wil.cx>

 * Copyright (C) 2001 Matthew Wilcox <matthew@wil.cx>

 *

 * The locking is really quite interesting.  There's a cpu-local

 * count of how many interrupts are being handled, and a global

 * lock.  An interrupt can only be serviced if the global lock

 * is free.  You can't be sure no more interrupts are being

 * serviced until you've acquired the lock and then checked

 * all the per-cpu interrupt counts are all zero.  It's a specialised

 * br_lock, and that's exactly how Sparc does it.  We don't because

 * it's more locking for us.  This way is lock-free in the interrupt path.

 */

 */





#ifndef _PARISC_HARDIRQ_H

#ifndef _PARISC_HARDIRQ_H

#define _PARISC_HARDIRQ_H

#define _PARISC_HARDIRQ_H





#include <linux/threads.h>

#include <asm-generic/hardirq.h>

#include <linux/irq.h>



typedef struct {

	unsigned long __softirq_pending; /* set_bit is used on this */

} ____cacheline_aligned irq_cpustat_t;



#include <linux/irq_cpustat.h>	/* Standard mappings for irq_cpustat_t above */



void ack_bad_irq(unsigned int irq);





#endif /* _PARISC_HARDIRQ_H */
 
#endif /* _PARISC_HARDIRQ_H */

arch/parisc/include/asm/ptrace.h

+4 −1
Original line number Original line Diff line number Diff line
@@ -59,8 +59,11 @@ void user_enable_block_step(struct task_struct *task); 
#define user_mode(regs)			(((regs)->iaoq[0] & 3) ? 1 : 0)

#define user_mode(regs)			(((regs)->iaoq[0] & 3) ? 1 : 0)

#define user_space(regs)		(((regs)->iasq[1] != 0) ? 1 : 0)

#define user_space(regs)		(((regs)->iasq[1] != 0) ? 1 : 0)

#define instruction_pointer(regs)	((regs)->iaoq[0] & ~3)

#define instruction_pointer(regs)	((regs)->iaoq[0] & ~3)

#define user_stack_pointer(regs)	((regs)->gr[30])

unsigned long profile_pc(struct pt_regs *);

unsigned long profile_pc(struct pt_regs *);

extern void show_regs(struct pt_regs *);

extern void show_regs(struct pt_regs *);

#endif





#endif /* __KERNEL__ */





#endif
 
#endif