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
Merge branch 'misc' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc...
[pandora-kernel.git]
/
arch
/
m32r
/
kernel
/
setup.c
diff --git
a/arch/m32r/kernel/setup.c
b/arch/m32r/kernel/setup.c
index
c2e4dcc
..
3cd3c29
100644
(file)
--- a/
arch/m32r/kernel/setup.c
+++ b/
arch/m32r/kernel/setup.c
@@
-9,6
+9,7
@@
#include <linux/config.h>
#include <linux/init.h>
#include <linux/config.h>
#include <linux/init.h>
+#include <linux/kernel.h>
#include <linux/stddef.h>
#include <linux/fs.h>
#include <linux/sched.h>
#include <linux/stddef.h>
#include <linux/fs.h>
#include <linux/sched.h>
@@
-24,6
+25,7
@@
#include <linux/tty.h>
#include <linux/cpu.h>
#include <linux/nodemask.h>
#include <linux/tty.h>
#include <linux/cpu.h>
#include <linux/nodemask.h>
+#include <linux/pfn.h>
#include <asm/processor.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
#include <asm/pgtable.h>
@@
-37,12
+39,6
@@
extern void init_mmu(void);
#endif
extern void init_mmu(void);
#endif
-#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_HD) \
- || defined(CONFIG_BLK_DEV_IDE_MODULE) \
- || defined(CONFIG_BLK_DEV_HD_MODULE)
-struct drive_info_struct { char dummy[32]; } drive_info;
-#endif
-
extern char _end[];
/*
extern char _end[];
/*
@@
-224,8
+220,6
@@
static unsigned long __init setup_memory(void)
extern unsigned long setup_memory(void);
#endif /* CONFIG_DISCONTIGMEM */
extern unsigned long setup_memory(void);
#endif /* CONFIG_DISCONTIGMEM */
-#define M32R_PCC_PCATCR 0x00ef7014 /* will move to m32r.h */
-
void __init setup_arch(char **cmdline_p)
{
ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
void __init setup_arch(char **cmdline_p)
{
ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
@@
-274,15
+268,14
@@
void __init setup_arch(char **cmdline_p)
paging_init();
}
paging_init();
}
-static struct cpu cpu[NR_CPUS];
+static struct cpu cpu
_devices
[NR_CPUS];
static int __init topology_init(void)
{
static int __init topology_init(void)
{
- int
cpu_id
;
+ int
i
;
- for (cpu_id = 0; cpu_id < NR_CPUS; cpu_id++)
- if (cpu_possible(cpu_id))
- register_cpu(&cpu[cpu_id], cpu_id, NULL);
+ for_each_present_cpu(i)
+ register_cpu(&cpu_devices[i], i, NULL);
return 0;
}
return 0;
}