From 08d841c24272a0733d76b8b88dbe6bd6161d6c95 Mon Sep 17 00:00:00 2001 From: Richard Kennedy Date: Tue, 7 Jun 2011 16:33:38 +0100 Subject: [PATCH] --- yaml --- r: 257059 b: refs/heads/master c: 28009ce4a8130af7260a9271901b4419834ad152 h: refs/heads/master i: 257057: 3e47929dbcf27b4389098607a375dcf62fd0570f 257055: d1ad3491b48694c216f53b9875b4675993636d3f v: v3 --- [refs] | 2 +- trunk/include/linux/perf_event.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fd8f231364a4..6c7e90776f1f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ec8363dfc1451f8c8f86825731fe712798ada02 +refs/heads/master: 28009ce4a8130af7260a9271901b4419834ad152 diff --git a/trunk/include/linux/perf_event.h b/trunk/include/linux/perf_event.h index e76a41010e1f..2f7b5d42ab41 100644 --- a/trunk/include/linux/perf_event.h +++ b/trunk/include/linux/perf_event.h @@ -894,8 +894,8 @@ struct perf_event_context { u64 parent_gen; u64 generation; int pin_count; - struct rcu_head rcu_head; int nr_cgroups; /* cgroup events present */ + struct rcu_head rcu_head; }; /*