diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-17 04:16:43 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-17 04:17:47 -0500 |
| commit | a7b63425a41cd6a8d50f76fef0660c5110f97e91 (patch) | |
| tree | be17ee121f1c8814d8d39c9f3e0205d9397fab54 /drivers/md/dm-log-userspace-base.c | |
| parent | 35039eb6b199749943547c8572be6604edf00229 (diff) | |
| parent | 3726cc75e581c157202da93bb2333cce25c15c98 (diff) | |
Merge branch 'perf/core' into perf/probes
Resolved merge conflict in tools/perf/Makefile
Merge reason: we want to queue up a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/md/dm-log-userspace-base.c')
| -rw-r--r-- | drivers/md/dm-log-userspace-base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-log-userspace-base.c b/drivers/md/dm-log-userspace-base.c index 652bd33109e3..7ac2c1450d10 100644 --- a/drivers/md/dm-log-userspace-base.c +++ b/drivers/md/dm-log-userspace-base.c | |||
| @@ -156,7 +156,7 @@ static int userspace_ctr(struct dm_dirty_log *log, struct dm_target *ti, | |||
| 156 | } | 156 | } |
| 157 | 157 | ||
| 158 | /* The ptr value is sufficient for local unique id */ | 158 | /* The ptr value is sufficient for local unique id */ |
| 159 | lc->luid = (uint64_t)lc; | 159 | lc->luid = (unsigned long)lc; |
| 160 | 160 | ||
| 161 | lc->ti = ti; | 161 | lc->ti = ti; |
| 162 | 162 | ||