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

Commit de481ba9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6: (27 commits)
  parisc: use generic atomic64 on 32-bit
  parisc: superio: fix build breakage
  parisc: Fix PCI resource allocation on non-PAT SBA machines
  parisc: perf: wire up sys_perf_counter_open
  parisc: add task_pt_regs macro
  parisc: wire sys_perf_counter_open to sys_ni_syscall
  parisc: inventory.c, fix bloated stack frame
  parisc: processor.c, fix bloated stack frame
  parisc: fix compile warning in mm/init.c
  parisc: remove dead code from sys_parisc32.c
  parisc: wire up rt_tgsigqueueinfo
  parisc: ensure broadcast tlb purge runs single threaded
  parisc: fix "delay!" timer handling
  parisc: fix mismatched parenthesis in memcpy.c
  parisc: Fix gcc 4.4 warning in lba_pci.c
  parisc: add parameter to read_cr16()
  parisc: decode_exc.c should include kernel.h
  parisc: remove obsolete hw_interrupt_type
  parisc: fix irq compile bugs in arch/parisc/kernel/irq.c
  parisc: advertise PCI devs after "assign_resources"
  ...

Manually fixed up trivial conflicts in tools/perf/perf.h due to addition
of SH vs HPPA perf-counter support.
parents dd0888c2 64daa443

arch/parisc/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ config PARISC 
	select RTC_DRV_GENERIC

	select INIT_ALL_POSSIBLE

	select BUG

	select HAVE_PERF_COUNTERS

	select GENERIC_ATOMIC64 if !64BIT

	help

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

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

arch/parisc/include/asm/atomic.h

+9 −5
Original line number Diff line number Diff line
@@ -222,13 +222,13 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) 


#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)



#define atomic_add(i,v)	((void)(__atomic_add_return( ((int)(i)),(v))))

#define atomic_sub(i,v)	((void)(__atomic_add_return(-((int)(i)),(v))))

#define atomic_add(i,v)	((void)(__atomic_add_return( (i),(v))))

#define atomic_sub(i,v)	((void)(__atomic_add_return(-(i),(v))))

#define atomic_inc(v)	((void)(__atomic_add_return(   1,(v))))

#define atomic_dec(v)	((void)(__atomic_add_return(  -1,(v))))



#define atomic_add_return(i,v)	(__atomic_add_return( ((int)(i)),(v)))

#define atomic_sub_return(i,v)	(__atomic_add_return(-((int)(i)),(v)))

#define atomic_add_return(i,v)	(__atomic_add_return( (i),(v)))

#define atomic_sub_return(i,v)	(__atomic_add_return(-(i),(v)))

#define atomic_inc_return(v)	(__atomic_add_return(   1,(v)))

#define atomic_dec_return(v)	(__atomic_add_return(  -1,(v)))
@@ -336,7 +336,11 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) 


#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)



#endif /* CONFIG_64BIT */

#else /* CONFIG_64BIT */



#include <asm-generic/atomic64.h>



#endif /* !CONFIG_64BIT */



#include <asm-generic/atomic-long.h>

arch/parisc/include/asm/dma.h

+1 −2
Original line number Diff line number Diff line 
/* $Id: dma.h,v 1.2 1999/04/27 00:46:18 deller Exp $

 * linux/include/asm/dma.h: Defines for using and allocating dma channels.

/* asm/dma.h: Defines for using and allocating dma channels.

 * Written by Hennus Bergman, 1992.

 * High DMA channel support & info by Hannu Savolainen

 * and John Boyd, Nov. 1992.

arch/parisc/include/asm/perf_counter.h

0 → 100644
+7 −0
Original line number Diff line number Diff line 
#ifndef __ASM_PARISC_PERF_COUNTER_H

#define __ASM_PARISC_PERF_COUNTER_H



/* parisc only supports software counters through this interface. */

static inline void set_perf_counter_pending(void) { }



#endif /* __ASM_PARISC_PERF_COUNTER_H */

arch/parisc/include/asm/processor.h

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <asm/types.h>

#include <asm/system.h>

#include <asm/percpu.h>



#endif /* __ASSEMBLY__ */



#define KERNEL_STACK_SIZE 	(4*PAGE_SIZE)
@@ -127,6 +128,8 @@ struct thread_struct { 
	unsigned long  flags;

}; 



#define task_pt_regs(tsk) ((struct pt_regs *)&((tsk)->thread.regs))



/* Thread struct flags. */

#define PARISC_UAC_NOPRINT	(1UL << 0)	/* see prctl and unaligned.c */

#define PARISC_UAC_SIGBUS	(1UL << 1)