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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[pandora-kernel.git]
/
arch
/
m68knommu
/
kernel
/
setup.c
diff --git
a/arch/m68knommu/kernel/setup.c
b/arch/m68knommu/kernel/setup.c
index
74bf949
..
5985f19
100644
(file)
--- a/
arch/m68knommu/kernel/setup.c
+++ b/
arch/m68knommu/kernel/setup.c
@@
-22,6
+22,7
@@
#include <linux/interrupt.h>
#include <linux/fb.h>
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/fb.h>
#include <linux/module.h>
+#include <linux/mm.h>
#include <linux/console.h>
#include <linux/errno.h>
#include <linux/string.h>
#include <linux/console.h>
#include <linux/errno.h>
#include <linux/string.h>
@@
-43,11
+44,8
@@
EXPORT_SYMBOL(memory_end);
char __initdata command_line[COMMAND_LINE_SIZE];
/* machine dependent timer functions */
char __initdata command_line[COMMAND_LINE_SIZE];
/* machine dependent timer functions */
-void (*mach_sched_init)(irq_handler_t handler);
-void (*mach_tick)(void);
void (*mach_gettod)(int*, int*, int*, int*, int*, int*);
int (*mach_set_clock_mmss)(unsigned long);
void (*mach_gettod)(int*, int*, int*, int*, int*, int*);
int (*mach_set_clock_mmss)(unsigned long);
-unsigned long (*mach_gettimeoffset)(void);
/* machine dependent reboot functions */
void (*mach_reset)(void);
/* machine dependent reboot functions */
void (*mach_reset)(void);
@@
-67,9
+65,6
@@
void (*mach_power_off)(void);
#ifdef CONFIG_M68VZ328
#define CPU "MC68VZ328"
#endif
#ifdef CONFIG_M68VZ328
#define CPU "MC68VZ328"
#endif
-#ifdef CONFIG_M68332
- #define CPU "MC68332"
-#endif
#ifdef CONFIG_M68360
#define CPU "MC68360"
#endif
#ifdef CONFIG_M68360
#define CPU "MC68360"
#endif
@@
-116,7
+111,7
@@
void (*mach_power_off)(void);
extern int _stext, _etext, _sdata, _edata, _sbss, _ebss, _end;
extern int _ramstart, _ramend;
extern int _stext, _etext, _sdata, _edata, _sbss, _ebss, _end;
extern int _ramstart, _ramend;
-void setup_arch(char **cmdline_p)
+void
__init
setup_arch(char **cmdline_p)
{
int bootmap_size;
{
int bootmap_size;
@@
-168,7
+163,7
@@
void setup_arch(char **cmdline_p)
printk(KERN_INFO "DragonEngine II board support by Georges Menie\n");
#endif
#ifdef CONFIG_M5235EVB
printk(KERN_INFO "DragonEngine II board support by Georges Menie\n");
#endif
#ifdef CONFIG_M5235EVB
- printk(KERN_INFO "Motorola M5235EVB support (C)2005 Syn-tech Systems, Inc. (Jate Sujjavanich)");
+ printk(KERN_INFO "Motorola M5235EVB support (C)2005 Syn-tech Systems, Inc. (Jate Sujjavanich)
\n
");
#endif
#ifdef DEBUG
#endif
#ifdef DEBUG
@@
-209,7
+204,7
@@
void setup_arch(char **cmdline_p)
* the bootmem bitmap so we then reserve it after freeing it :-)
*/
free_bootmem(memory_start, memory_end - memory_start);
* the bootmem bitmap so we then reserve it after freeing it :-)
*/
free_bootmem(memory_start, memory_end - memory_start);
- reserve_bootmem(memory_start, bootmap_size);
+ reserve_bootmem(memory_start, bootmap_size
, BOOTMEM_DEFAULT
);
/*
* Get kmalloc into gear.
/*
* Get kmalloc into gear.
@@
-266,7
+261,7
@@
static void c_stop(struct seq_file *m, void *v)
{
}
{
}
-struct seq_operations cpuinfo_op = {
+
const
struct seq_operations cpuinfo_op = {
.start = c_start,
.next = c_next,
.stop = c_stop,
.start = c_start,
.next = c_next,
.stop = c_stop,