From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 23 Oct 2008 17:05:40 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile
X-Git-Tag: v2.6.28-rc1~35
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=92fb83afd6664a6f8a05f990d264c998f9b99f69

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile: (21 commits)
  OProfile: Fix buffer synchronization for IBS
  oprofile: hotplug cpu fix
  oprofile: fixing whitespaces in arch/x86/oprofile/*
  oprofile: fixing whitespaces in arch/x86/oprofile/*
  oprofile: fixing whitespaces in drivers/oprofile/*
  x86/oprofile: add the logic for enabling additional IBS bits
  x86/oprofile: reordering functions in nmi_int.c
  x86/oprofile: removing unused function parameter in add_ibs_begin()
  oprofile: more whitespace fixes
  oprofile: whitespace fixes
  OProfile: Rename IBS sysfs dir into "ibs_op"
  OProfile: Rework string handling in setup_ibs_files()
  OProfile: Rework oprofile_add_ibs_sample() function
  oprofile: discover counters for op ppro too
  oprofile: Implement Intel architectural perfmon support
  oprofile: Don't report Nehalem as core_2
  oprofile: drop const in num counters field
  Revert "Oprofile Multiplexing Patch"
  x86, oprofile: BUG: using smp_processor_id() in preemptible code
  x86/oprofile: fix on_each_cpu build error
  ...

Manually fixed trivial conflicts in
	drivers/oprofile/{cpu_buffer.c,event_buffer.h}
---

92fb83afd6664a6f8a05f990d264c998f9b99f69
diff --cc drivers/oprofile/event_buffer.h
index 84bf324c577,00db2e66570..4e70749f8d1
--- a/drivers/oprofile/event_buffer.h
+++ b/drivers/oprofile/event_buffer.h
@@@ -16,14 -16,7 +16,14 @@@
  int alloc_event_buffer(void);
  
  void free_event_buffer(void);
-  
+ 
 +/**
 + * Add data to the event buffer.
 + * The data passed is free-form, but typically consists of
 + * file offsets, dcookies, context information, and ESCAPE codes.
 + */
 +void add_event_entry(unsigned long data);
 +
  /* wake up the process sleeping on the event file */
  void wake_up_buffer_waiter(void);