mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
[PATCH] namespaces: utsname: use init_utsname when appropriate
In some places, particularly drivers and __init code, the init utsns is the appropriate one to use. This patch replaces those with a the init_utsname helper. Changes: Removed several uses of init_utsname(). Hope I picked all the right ones in net/ipv4/ipconfig.c. These are now changed to utsname() (the per-process namespace utsname) in the previous patch (2/7) [[email protected]: CIFS fix] Signed-off-by: Serge E. Hallyn <[email protected]> Cc: Kirill Korotaev <[email protected]> Cc: "Eric W. Biederman" <[email protected]> Cc: Herbert Poetzl <[email protected]> Cc: Andrey Savochkin <[email protected]> Cc: Serge Hallyn <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
e9ff3990f0
commit
96b644bdec
28 changed files with 52 additions and 52 deletions
|
|
@ -318,8 +318,8 @@ static int rh_string (
|
|||
|
||||
// id 3 == vendor description
|
||||
} else if (id == 3) {
|
||||
snprintf (buf, sizeof buf, "%s %s %s", system_utsname.sysname,
|
||||
system_utsname.release, hcd->driver->description);
|
||||
snprintf (buf, sizeof buf, "%s %s %s", init_utsname()->sysname,
|
||||
init_utsname()->release, hcd->driver->description);
|
||||
|
||||
// unsupported IDs --> "protocol stall"
|
||||
} else
|
||||
|
|
|
|||
|
|
@ -2260,7 +2260,7 @@ eth_bind (struct usb_gadget *gadget)
|
|||
return -ENODEV;
|
||||
}
|
||||
snprintf (manufacturer, sizeof manufacturer, "%s %s/%s",
|
||||
system_utsname.sysname, system_utsname.release,
|
||||
init_utsname()->sysname, init_utsname()->release,
|
||||
gadget->name);
|
||||
|
||||
/* If there's an RNDIS configuration, that's what Windows wants to
|
||||
|
|
|
|||
|
|
@ -4001,7 +4001,7 @@ static int __init fsg_bind(struct usb_gadget *gadget)
|
|||
usb_gadget_set_selfpowered(gadget);
|
||||
|
||||
snprintf(manufacturer, sizeof manufacturer, "%s %s with %s",
|
||||
system_utsname.sysname, system_utsname.release,
|
||||
init_utsname()->sysname, init_utsname()->release,
|
||||
gadget->name);
|
||||
|
||||
/* On a real device, serial[] would be loaded from permanent
|
||||
|
|
|
|||
|
|
@ -1189,7 +1189,7 @@ static int __devinit gmidi_bind(struct usb_gadget *gadget)
|
|||
strlcpy(manufacturer, iManufacturer, sizeof(manufacturer));
|
||||
} else {
|
||||
snprintf(manufacturer, sizeof(manufacturer), "%s %s with %s",
|
||||
system_utsname.sysname, system_utsname.release,
|
||||
init_utsname()->sysname, init_utsname()->release,
|
||||
gadget->name);
|
||||
}
|
||||
if (iProduct) {
|
||||
|
|
|
|||
|
|
@ -1434,7 +1434,7 @@ static int __init gs_bind(struct usb_gadget *gadget)
|
|||
return -ENOMEM;
|
||||
|
||||
snprintf(manufacturer, sizeof(manufacturer), "%s %s with %s",
|
||||
system_utsname.sysname, system_utsname.release,
|
||||
init_utsname()->sysname, init_utsname()->release,
|
||||
gadget->name);
|
||||
|
||||
memset(dev, 0, sizeof(struct gs_dev));
|
||||
|
|
|
|||
|
|
@ -1242,7 +1242,7 @@ autoconf_fail:
|
|||
EP_OUT_NAME, EP_IN_NAME);
|
||||
|
||||
snprintf (manufacturer, sizeof manufacturer, "%s %s with %s",
|
||||
system_utsname.sysname, system_utsname.release,
|
||||
init_utsname()->sysname, init_utsname()->release,
|
||||
gadget->name);
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Reference in a new issue