projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[linux-drm-fsl-dcu.git]
/
arch
/
um
/
kernel
/
um_arch.c
diff --git
a/arch/um/kernel/um_arch.c
b/arch/um/kernel/um_arch.c
index 7896cf98232df1a06c6593957e24597b8dbb7e04..84e57f6da1d3f8c87ce2af810b62914ad551cdbb 100644
(file)
--- a/
arch/um/kernel/um_arch.c
+++ b/
arch/um/kernel/um_arch.c
@@
-3,7
+3,6
@@
* Licensed under the GPL
*/
* Licensed under the GPL
*/
-#include "linux/config.h"
#include "linux/kernel.h"
#include "linux/sched.h"
#include "linux/notifier.h"
#include "linux/kernel.h"
#include "linux/sched.h"
#include "linux/notifier.h"
@@
-31,7
+30,6
@@
#include "kern.h"
#include "mem_user.h"
#include "mem.h"
#include "kern.h"
#include "mem_user.h"
#include "mem.h"
-#include "umid.h"
#include "initrd.h"
#include "init.h"
#include "os.h"
#include "initrd.h"
#include "init.h"
#include "os.h"
@@
-106,7
+104,7
@@
static void c_stop(struct seq_file *m, void *v)
{
}
{
}
-struct seq_operations cpuinfo_op = {
+
const
struct seq_operations cpuinfo_op = {
.start = c_start,
.next = c_next,
.stop = c_stop,
.start = c_start,
.next = c_next,
.stop = c_stop,
@@
-167,7
+165,7
@@
static char *usage_string =
static int __init uml_version_setup(char *line, int *add)
{
static int __init uml_version_setup(char *line, int *add)
{
- printf("%s\n",
system_utsname.
release);
+ printf("%s\n",
init_utsname()->
release);
exit(0);
return 0;
exit(0);
return 0;
@@
-278,7
+276,7
@@
static int __init Usage(char *line, int *add)
{
const char **p;
{
const char **p;
- printf(usage_string,
system_utsname.
release);
+ printf(usage_string,
init_utsname()->
release);
p = &__uml_help_start;
while (p < &__uml_help_end) {
printf("%s", *p);
p = &__uml_help_start;
while (p < &__uml_help_end) {
printf("%s", *p);
@@
-403,7
+401,7
@@
int linux_main(int argc, char **argv)
/* Reserve up to 4M after the current brk */
uml_reserved = ROUND_4M(brk_start) + (1 << 22);
/* Reserve up to 4M after the current brk */
uml_reserved = ROUND_4M(brk_start) + (1 << 22);
- setup_machinename(
system_utsname.
machine);
+ setup_machinename(
init_utsname()->
machine);
#ifdef CONFIG_CMDLINE_ON_HOST
argv1_begin = argv[1];
#ifdef CONFIG_CMDLINE_ON_HOST
argv1_begin = argv[1];