diff --git a/[refs] b/[refs] index e5018d54e277..12b02f59300c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 093aed1937cc7ae9290ede24ad45f040e097510b +refs/heads/master: e9c4148fd4f03008ecbe3b673e25764232a15503 diff --git a/trunk/arch/sh/oprofile/op_impl.h b/trunk/arch/sh/oprofile/op_impl.h index 4d509975eba6..1244479ceb29 100644 --- a/trunk/arch/sh/oprofile/op_impl.h +++ b/trunk/arch/sh/oprofile/op_impl.h @@ -6,7 +6,7 @@ struct op_counter_config { unsigned long enabled; unsigned long event; - unsigned long long count; + unsigned long count; /* Dummy values for userspace tool compliance */ unsigned long kernel;