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
fedora core 6 1.2949 + vserver 2.2.0
[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
27cdf91
..
66f43c9
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"
@@
-106,7
+105,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
+166,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
+277,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);
@@
-330,6
+329,8
@@
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;
@@
-374,8
+375,9
@@
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 = CHOOSE_MODE_PROC(set_task_sizes_tt, set_task_sizes_skas, 0,
- &host_task_size, &task_size);
+ uml_start = (unsigned long) &__binary_start;
+ host_task_size = CHOOSE_MODE_PROC(set_task_sizes_tt,
+ set_task_sizes_skas, &task_size);
/*
* Setting up handlers to 'sig_info' struct
/*
* Setting up handlers to 'sig_info' struct
@@
-395,12
+397,12
@@
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;
+ uml_physmem = uml_start
& PAGE_MASK
;
/* 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];
@@
-421,7
+423,7
@@
int linux_main(int argc, char **argv)
#ifndef CONFIG_HIGHMEM
highmem = 0;
printf("CONFIG_HIGHMEM not enabled - physical memory shrunk "
#ifndef CONFIG_HIGHMEM
highmem = 0;
printf("CONFIG_HIGHMEM not enabled - physical memory shrunk "
- "to %
l
u bytes\n", physmem_size);
+ "to %
L
u bytes\n", physmem_size);
#endif
}
#endif
}
@@
-433,8
+435,8
@@
int linux_main(int argc, char **argv)
setup_physmem(uml_physmem, uml_reserved, physmem_size, highmem);
if(init_maps(physmem_size, iomem_size, highmem)){
setup_physmem(uml_physmem, uml_reserved, physmem_size, highmem);
if(init_maps(physmem_size, iomem_size, highmem)){
- printf("Failed to allocate mem_map for %
l
u bytes of physical "
- "memory and %
l
u bytes of highmem\n", physmem_size,
+ printf("Failed to allocate mem_map for %
L
u bytes of physical "
+ "memory and %
L
u bytes of highmem\n", physmem_size,
highmem);
exit(1);
}
highmem);
exit(1);
}
@@
-477,7
+479,8
@@
static struct notifier_block panic_exit_notifier = {
void __init setup_arch(char **cmdline_p)
{
void __init setup_arch(char **cmdline_p)
{
- notifier_chain_register(&panic_notifier_list, &panic_exit_notifier);
+ atomic_notifier_chain_register(&panic_notifier_list,
+ &panic_exit_notifier);
paging_init();
strlcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
*cmdline_p = command_line;
paging_init();
strlcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
*cmdline_p = command_line;
@@
-487,10
+490,21
@@
void __init setup_arch(char **cmdline_p)
void __init check_bugs(void)
{
arch_check_bugs();
void __init check_bugs(void)
{
arch_check_bugs();
- check_sigio();
- check_devanon();
+ os_check_bugs();
}
}
-void apply_alternatives(void *start, void *end)
+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_del(struct module *mod)
+{
+}
+#endif