diff options
author | Theodore Tso <tytso@mit.edu> | 2006-07-03 03:24:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-03 18:26:58 -0400 |
commit | c61a8416ed3db84481651270032696a4781cac17 (patch) | |
tree | 15ffa349c0781900bf484263b47992962ba57ce9 /arch/um | |
parent | 6abd219c6eab92172038e4719e02905acb7b68d4 (diff) |
[PATCH] uml build fix
This is needed to fix UML compilation given that alternatives_smp_module_add
and alternatives_smp_module_del are null inline functions if !CONFIG_SMP.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um')
-rw-r--r-- | arch/um/kernel/um_arch.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c index 7d51dd7201c3..37cfe7701f06 100644 --- a/arch/um/kernel/um_arch.c +++ b/arch/um/kernel/um_arch.c | |||
@@ -495,6 +495,7 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end) | |||
495 | { | 495 | { |
496 | } | 496 | } |
497 | 497 | ||
498 | #ifdef CONFIG_SMP | ||
498 | void alternatives_smp_module_add(struct module *mod, char *name, | 499 | void alternatives_smp_module_add(struct module *mod, char *name, |
499 | void *locks, void *locks_end, | 500 | void *locks, void *locks_end, |
500 | void *text, void *text_end) | 501 | void *text, void *text_end) |
@@ -504,3 +505,4 @@ void alternatives_smp_module_add(struct module *mod, char *name, | |||
504 | void alternatives_smp_module_del(struct module *mod) | 505 | void alternatives_smp_module_del(struct module *mod) |
505 | { | 506 | { |
506 | } | 507 | } |
508 | #endif | ||