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 branches 'stable/irq', 'stable/p2m.bugfixes', 'stable/e820.bugfixes' and 'stabl...
[pandora-kernel.git]
/
arch
/
x86
/
xen
/
setup.c
diff --git
a/arch/x86/xen/setup.c
b/arch/x86/xen/setup.c
index
ca6297b
..
be1a464
100644
(file)
--- a/
arch/x86/xen/setup.c
+++ b/
arch/x86/xen/setup.c
@@
-50,7
+50,7
@@
phys_addr_t xen_extra_mem_start, xen_extra_mem_size;
*/
#define EXTRA_MEM_RATIO (10)
*/
#define EXTRA_MEM_RATIO (10)
-static
__init void
xen_add_extra_mem(unsigned long pages)
+static
void __init
xen_add_extra_mem(unsigned long pages)
{
unsigned long pfn;
{
unsigned long pfn;
@@
-340,7
+340,7
@@
static void __init fiddle_vdso(void)
#endif
}
#endif
}
-static
__cpuinit in
t register_callback(unsigned type, const void *func)
+static
int __cpuini
t register_callback(unsigned type, const void *func)
{
struct callback_register callback = {
.type = type,
{
struct callback_register callback = {
.type = type,