diff options
author | David S. Miller <davem@davemloft.net> | 2010-02-20 13:53:16 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-20 13:53:16 -0800 |
commit | 198d2f63a6096fe575b696b13ba61b62c620266f (patch) | |
tree | d0c2b0697370cc670029cd1eb2a80c35c71eac60 /kernel/hw_breakpoint.c | |
parent | 0da2b300b91ddeb9944c3fb4faaf78c1c482c0af (diff) | |
parent | 1f474646fdc36b457606bbcd6a3592e6cbd31ac4 (diff) | |
download | kernel-crypto-198d2f63a6096fe575b696b13ba61b62c620266f.tar.gz kernel-crypto-198d2f63a6096fe575b696b13ba61b62c620266f.tar.xz kernel-crypto-198d2f63a6096fe575b696b13ba61b62c620266f.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'kernel/hw_breakpoint.c')
-rw-r--r-- | kernel/hw_breakpoint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/hw_breakpoint.c b/kernel/hw_breakpoint.c index 8a5c7d55ac9..967e66143e1 100644 --- a/kernel/hw_breakpoint.c +++ b/kernel/hw_breakpoint.c @@ -360,8 +360,8 @@ EXPORT_SYMBOL_GPL(register_user_hw_breakpoint); int modify_user_hw_breakpoint(struct perf_event *bp, struct perf_event_attr *attr) { u64 old_addr = bp->attr.bp_addr; + u64 old_len = bp->attr.bp_len; int old_type = bp->attr.bp_type; - int old_len = bp->attr.bp_len; int err = 0; perf_event_disable(bp); |