From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 4 Jul 2009 17:35:12 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
X-Git-Tag: 2.1b_release~11992
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=de481ba925e880764e38b8756c93c05006892507;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git

Merge branch 'for-linus' of git://git./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.
---

de481ba925e880764e38b8756c93c05006892507
diff --cc tools/perf/perf.h
index 8f729ae,188801b..d3042a6
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@@ -19,16 -19,12 +19,22 @@@
  #define cpu_relax()	asm volatile("" ::: "memory");
  #endif
  
 +#ifdef __sh__
 +#include "../../arch/sh/include/asm/unistd.h"
 +#if defined(__SH4A__) || defined(__SH5__)
 +# define rmb()		asm volatile("synco" ::: "memory")
 +#else
 +# define rmb()		asm volatile("" ::: "memory")
 +#endif
 +#define cpu_relax()	asm volatile("" ::: "memory")
 +#endif
 +
+ #ifdef __hppa__
+ #include "../../arch/parisc/include/asm/unistd.h"
+ #define rmb()		asm volatile("" ::: "memory")
+ #define cpu_relax()	asm volatile("" ::: "memory");
+ #endif
+ 
  #include <time.h>
  #include <unistd.h>
  #include <sys/types.h>