git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
arch
/
um
/
kernel
/
um_arch.c
diff --git
a/arch/um/kernel/um_arch.c
b/arch/um/kernel/um_arch.c
index
b9a8f42
..
7d51dd7
100644
(file)
--- a/
arch/um/kernel/um_arch.c
+++ b/
arch/um/kernel/um_arch.c
@@
-3,6
+3,7
@@
* 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"
@@
-329,8
+330,6
@@
EXPORT_SYMBOL(end_iomem);
#define MIN_VMALLOC (32 * 1024 * 1024)
#define MIN_VMALLOC (32 * 1024 * 1024)
-extern char __binary_start;
-
int linux_main(int argc, char **argv)
{
unsigned long avail, diff;
int linux_main(int argc, char **argv)
{
unsigned long avail, diff;
@@
-375,9
+374,8
@@
int linux_main(int argc, char **argv)
printf("UML running in %s mode\n", mode);
printf("UML running in %s mode\n", mode);
- uml_start = (unsigned long) &__binary_start;
- host_task_size = CHOOSE_MODE_PROC(set_task_sizes_tt,
- set_task_sizes_skas, &task_size);
+ uml_start = CHOOSE_MODE_PROC(set_task_sizes_tt, set_task_sizes_skas, 0,
+ &host_task_size, &task_size);
/*
* Setting up handlers to 'sig_info' struct
/*
* Setting up handlers to 'sig_info' struct
@@
-397,7
+395,7
@@
int linux_main(int argc, char **argv)
physmem_size += UML_ROUND_UP(brk_start) - UML_ROUND_UP(&_end);
}
physmem_size += UML_ROUND_UP(brk_start) - UML_ROUND_UP(&_end);
}
- uml_physmem = uml_start
& PAGE_MASK
;
+ uml_physmem = uml_start;
/* 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);
@@
-497,7
+495,6
@@
void apply_alternatives(struct alt_instr *start, struct alt_instr *end)
{
}
{
}
-#ifdef CONFIG_SMP
void alternatives_smp_module_add(struct module *mod, char *name,
void *locks, void *locks_end,
void *text, void *text_end)
void alternatives_smp_module_add(struct module *mod, char *name,
void *locks, void *locks_end,
void *text, void *text_end)
@@
-507,4
+504,3
@@
void alternatives_smp_module_add(struct module *mod, char *name,
void alternatives_smp_module_del(struct module *mod)
{
}
void alternatives_smp_module_del(struct module *mod)
{
}
-#endif