git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] uml build fix
[pandora-kernel.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
..
37cfe77
100644
(file)
--- a/
arch/um/kernel/um_arch.c
+++ b/
arch/um/kernel/um_arch.c
@@
-421,7
+421,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
+433,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
+477,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
+488,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