diff options
Diffstat (limited to '')
-rw-r--r-- | arch/frv/kernel/setup.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c index 5908deae9607..af08ccd4ed6e 100644 --- a/arch/frv/kernel/setup.c +++ b/arch/frv/kernel/setup.c @@ -10,8 +10,7 @@ * 2 of the License, or (at your option) any later version. */ -#include <linux/config.h> -#include <linux/version.h> +#include <linux/utsrelease.h> #include <linux/kernel.h> #include <linux/sched.h> #include <linux/delay.h> @@ -814,7 +813,7 @@ void __init setup_arch(char **cmdline_p) * - by now the stack is part of the init task */ printk("Memory %08lx-%08lx\n", memory_start, memory_end); - if (memory_start == memory_end) BUG(); + BUG_ON(memory_start == memory_end); init_mm.start_code = (unsigned long) &_stext; init_mm.end_code = (unsigned long) &_etext; |