Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf: Always build the powerpc perf_arch_fetch_caller_regs version
  perf: Always build the stub perf_arch_fetch_caller_regs version
  perf, probe-finder: Build fix on Debian
  perf/scripts: Tuple was set from long in both branches in python_process_event()
  perf: Fix 'perf sched record' deadlock
  perf, x86: Fix callgraphs of 32-bit processes on 64-bit kernels
  perf, x86: Fix AMD hotplug & constraint initialization
  x86: Move notify_cpu_starting() callback to a later stage
  x86,kgdb: Always initialize the hw breakpoint attribute
  perf: Use hot regs with software sched switch/migrate events
  perf: Correctly align perf event tracing buffer

1 files changed, 12 insertions, 5 deletions

diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
index 33a414bbba3..6a72f14c598 100644
--- a/tools/perf/util/scripting-engines/trace-event-python.c
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
@@ -208,7 +208,7 @@ static void python_process_event(int cpu, void *data,
                                  int size __unused,
                                  unsigned long long nsecs, char *comm)
 {
-        PyObject *handler, *retval, *context, *t;
+        PyObject *handler, *retval, *context, *t, *obj;
         static char handler_name[256];
         struct format_field *field;
         unsigned long long val;
@@ -256,16 +256,23 @@ static void python_process_event(int cpu, void *data,
                                 offset &= 0xffff;
                         } else
                                 offset = field->offset;
-                        PyTuple_SetItem(t, n++,
-                                PyString_FromString((char *)data + offset));
+                        obj = PyString_FromString((char *)data + offset);
                 } else { /* FIELD_IS_NUMERIC */
                         val = read_size(data + field->offset, field->size);
                         if (field->flags & FIELD_IS_SIGNED) {
-                                PyTuple_SetItem(t, n++, PyInt_FromLong(val));
+                                if ((long long)val >= LONG_MIN &&
+                                    (long long)val <= LONG_MAX)
+                                        obj = PyInt_FromLong(val);
+                                else
+                                        obj = PyLong_FromLongLong(val);
                         } else {
-                                PyTuple_SetItem(t, n++, PyInt_FromLong(val));
+                                if (val <= LONG_MAX)
+                                        obj = PyInt_FromLong(val);
+                                else
+                                        obj = PyLong_FromUnsignedLongLong(val);
                         }
                 }
+                PyTuple_SetItem(t, n++, obj);
         }
 
         if (_PyTuple_Resize(&t, n) == -1)