diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-06-19 15:14:35 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-06-19 15:14:35 -0300 |
| commit | 8052bd8243e823a0954bcbafda8f91072598f13d (patch) | |
| tree | e5f1502735c2a75fbe865cf57582d2e8354e6f43 /arch/sparc/kernel/ds.c | |
| parent | d0fabd1cb8b70073a0f44f1cf8b663b5e7241c74 (diff) | |
| parent | 531c221df182af5a7fc2bf7ba7eee89354fe9a10 (diff) | |
Merge remote-tracking branch 'tip/perf/urgent' into perf/core
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'arch/sparc/kernel/ds.c')
| -rw-r--r-- | arch/sparc/kernel/ds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c index b542cc7c8d94..f87265afb175 100644 --- a/arch/sparc/kernel/ds.c +++ b/arch/sparc/kernel/ds.c @@ -909,7 +909,7 @@ static int register_services(struct ds_info *dp) pbuf.req.handle = cp->handle; pbuf.req.major = 1; pbuf.req.minor = 0; - strcpy(pbuf.req.svc_id, cp->service_id); + strcpy(pbuf.id_buf, cp->service_id); err = __ds_send(lp, &pbuf, msg_len); if (err > 0) |