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
/
cris
/
kernel
/
setup.c
diff --git
a/arch/cris/kernel/setup.c
b/arch/cris/kernel/setup.c
index
1ba57ef
..
ca8b45a
100644
(file)
--- a/
arch/cris/kernel/setup.c
+++ b/
arch/cris/kernel/setup.c
@@
-10,14
+10,14
@@
* This file handles the architecture-dependent parts of initialization
*/
* This file handles the architecture-dependent parts of initialization
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/bootmem.h>
#include <asm/pgtable.h>
#include <linux/seq_file.h>
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/bootmem.h>
#include <asm/pgtable.h>
#include <linux/seq_file.h>
-#include <linux/
tty
.h>
+#include <linux/
screen_info
.h>
#include <linux/utsname.h>
#include <linux/utsname.h>
+#include <linux/pfn.h>
#include <asm/setup.h>
#include <asm/setup.h>
@@
-88,10
+88,6
@@
setup_arch(char **cmdline_p)
init_mm.end_data = (unsigned long) &_edata;
init_mm.brk = (unsigned long) &_end;
init_mm.end_data = (unsigned long) &_edata;
init_mm.brk = (unsigned long) &_end;
-#define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
-#define PFN_DOWN(x) ((x) >> PAGE_SHIFT)
-#define PFN_PHYS(x) ((x) << PAGE_SHIFT)
-
/* min_low_pfn points to the start of DRAM, start_pfn points
* to the first DRAM pages after the kernel, and max_low_pfn
* to the end of DRAM.
/* min_low_pfn points to the start of DRAM, start_pfn points
* to the first DRAM pages after the kernel, and max_low_pfn
* to the end of DRAM.
@@
-164,7
+160,7
@@
setup_arch(char **cmdline_p)
show_etrax_copyright();
/* Setup utsname */
show_etrax_copyright();
/* Setup utsname */
- strcpy(
system_utsname.
machine, cris_machine_name);
+ strcpy(
init_utsname()->
machine, cris_machine_name);
}
static void *c_start(struct seq_file *m, loff_t *pos)
}
static void *c_start(struct seq_file *m, loff_t *pos)