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
Linux 2.6.26
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
setup_32.c
diff --git
a/arch/x86/kernel/setup_32.c
b/arch/x86/kernel/setup_32.c
index
44cc9b9
..
5a2f8e0
100644
(file)
--- a/
arch/x86/kernel/setup_32.c
+++ b/
arch/x86/kernel/setup_32.c
@@
-47,6
+47,7
@@
#include <linux/pfn.h>
#include <linux/pci.h>
#include <linux/init_ohci1394_dma.h>
#include <linux/pfn.h>
#include <linux/pci.h>
#include <linux/init_ohci1394_dma.h>
+#include <linux/kvm_para.h>
#include <video/edid.h>
#include <video/edid.h>
@@
-126,7
+127,12
@@
static struct resource standard_io_resources[] = { {
}, {
.name = "keyboard",
.start = 0x0060,
}, {
.name = "keyboard",
.start = 0x0060,
- .end = 0x006f,
+ .end = 0x0060,
+ .flags = IORESOURCE_BUSY | IORESOURCE_IO
+}, {
+ .name = "keyboard",
+ .start = 0x0064,
+ .end = 0x0064,
.flags = IORESOURCE_BUSY | IORESOURCE_IO
}, {
.name = "dma page reg",
.flags = IORESOURCE_BUSY | IORESOURCE_IO
}, {
.name = "dma page reg",
@@
-526,10
+532,16
@@
static void __init reserve_crashkernel(void)
(unsigned long)(crash_size >> 20),
(unsigned long)(crash_base >> 20),
(unsigned long)(total_mem >> 20));
(unsigned long)(crash_size >> 20),
(unsigned long)(crash_base >> 20),
(unsigned long)(total_mem >> 20));
+
+ if (reserve_bootmem(crash_base, crash_size,
+ BOOTMEM_EXCLUSIVE) < 0) {
+ printk(KERN_INFO "crashkernel reservation "
+ "failed - memory is in use\n");
+ return;
+ }
+
crashk_res.start = crash_base;
crashk_res.end = crash_base + crash_size - 1;
crashk_res.start = crash_base;
crashk_res.end = crash_base + crash_size - 1;
- reserve_bootmem(crash_base, crash_size,
- BOOTMEM_DEFAULT);
} else
printk(KERN_INFO "crashkernel reservation failed - "
"you have to specify a base address\n");
} else
printk(KERN_INFO "crashkernel reservation failed - "
"you have to specify a base address\n");
@@
-820,6
+832,10
@@
void __init setup_arch(char **cmdline_p)
max_low_pfn = setup_memory();
max_low_pfn = setup_memory();
+#ifdef CONFIG_KVM_CLOCK
+ kvmclock_init();
+#endif
+
#ifdef CONFIG_VMI
/*
* Must be after max_low_pfn is determined, and before kernel
#ifdef CONFIG_VMI
/*
* Must be after max_low_pfn is determined, and before kernel
@@
-827,6
+843,7
@@
void __init setup_arch(char **cmdline_p)
*/
vmi_init();
#endif
*/
vmi_init();
#endif
+ kvm_guest_init();
/*
* NOTE: before this point _nobody_ is allowed to allocate
/*
* NOTE: before this point _nobody_ is allowed to allocate