mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
merge?
This commit is contained in:
commit
98b638231e
4 files changed
+9
No files matched your search
@@ -784,7 +784,9 @@ static int __init smp_scan_config (unsigned long base, unsigned long length)
|
||||
|
||||
void __init find_smp_config (void)
|
||||
{
|
||||
#ifndef CONFIG_XEN
|
||||
unsigned int address;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* FIXME: Linux assumes you have 640K of base ram..
|
||||
|
||||
@@ -1604,6 +1604,9 @@ static void smp_intr_exit(void)
|
||||
unbind_ipi_from_irq(CALL_FUNCTION_VECTOR);
|
||||
}
|
||||
|
||||
extern void local_setup_timer_irq(void);
|
||||
extern void local_teardown_timer_irq(void);
|
||||
|
||||
void smp_suspend(void)
|
||||
{
|
||||
/* XXX todo: take down time and ipi's on all cpus */
|
||||
|
||||
@@ -435,9 +435,11 @@ void unbind_evtchn_from_irqhandler(unsigned int evtchn, void *dev_id)
|
||||
unbind_evtchn_from_irq(evtchn);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
static void do_nothing_function(void *ign)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Rebind an evtchn so that it gets delivered to a specific cpu */
|
||||
static void rebind_irq_to_cpu(unsigned irq, unsigned tcpu)
|
||||
|
||||
@@ -11,6 +11,8 @@
|
||||
* Copyright (c) 2005, Christopher Clark
|
||||
*/
|
||||
|
||||
#include <linux/spinlock.h>
|
||||
#include <asm-xen/balloon.h>
|
||||
#include "common.h"
|
||||
|
||||
/*
|
||||
|
||||