# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID 828c0c89d8309427f65d5293173f24487c5dd7d4
# Parent f983ed5e9098610b5200d5050a9cab0c08189673
Move initialize_keytable declaration to keyhandler.h
Signed-off-by: Aron Griffis <aron@xxxxxx>
---
xen/arch/ia64/xen/xensetup.c | 1 -
xen/arch/powerpc/setup.c | 3 ---
xen/arch/x86/setup.c | 3 +--
xen/include/xen/keyhandler.h | 3 +++
4 files changed, 4 insertions(+), 6 deletions(-)
diff -r f983ed5e9098 -r 828c0c89d830 xen/arch/ia64/xen/xensetup.c
--- a/xen/arch/ia64/xen/xensetup.c Sat Sep 23 14:07:30 2006 +0100
+++ b/xen/arch/ia64/xen/xensetup.c Sat Sep 23 14:07:41 2006 +0100
@@ -38,7 +38,6 @@ int find_max_pfn (unsigned long, unsigne
int find_max_pfn (unsigned long, unsigned long, void *);
/* FIXME: which header these declarations should be there ? */
-extern void initialize_keytable(void);
extern long is_platform_hp_ski(void);
extern void early_setup_arch(char **);
extern void late_setup_arch(char **);
diff -r f983ed5e9098 -r 828c0c89d830 xen/arch/powerpc/setup.c
--- a/xen/arch/powerpc/setup.c Sat Sep 23 14:07:30 2006 +0100
+++ b/xen/arch/powerpc/setup.c Sat Sep 23 14:07:41 2006 +0100
@@ -87,9 +87,6 @@ struct ns16550_defaults ns16550;
extern char __per_cpu_start[], __per_cpu_data_end[], __per_cpu_end[];
-/* move us to a header file */
-extern void initialize_keytable(void);
-
volatile struct processor_area * volatile global_cpu_table[NR_CPUS];
int is_kernel_text(unsigned long addr)
diff -r f983ed5e9098 -r 828c0c89d830 xen/arch/x86/setup.c
--- a/xen/arch/x86/setup.c Sat Sep 23 14:07:30 2006 +0100
+++ b/xen/arch/x86/setup.c Sat Sep 23 14:07:41 2006 +0100
@@ -1,4 +1,3 @@
-
#include <xen/config.h>
#include <xen/init.h>
#include <xen/lib.h>
@@ -16,6 +15,7 @@
#include <xen/gdbstub.h>
#include <xen/percpu.h>
#include <xen/hypercall.h>
+#include <xen/keyhandler.h>
#include <public/version.h>
#include <asm/bitops.h>
#include <asm/smp.h>
@@ -81,7 +81,6 @@ extern void init_IRQ(void);
extern void init_IRQ(void);
extern void trap_init(void);
extern void early_time_init(void);
-extern void initialize_keytable(void);
extern void early_cpu_init(void);
struct tss_struct init_tss[NR_CPUS];
diff -r f983ed5e9098 -r 828c0c89d830 xen/include/xen/keyhandler.h
--- a/xen/include/xen/keyhandler.h Sat Sep 23 14:07:30 2006 +0100
+++ b/xen/include/xen/keyhandler.h Sat Sep 23 14:07:41 2006 +0100
@@ -9,6 +9,9 @@
#ifndef __XEN_KEYHANDLER_H__
#define __XEN_KEYHANDLER_H__
+
+/* Initialize keytable with default handlers */
+extern void initialize_keytable(void);
/*
* Register a callback function for key @key. The callback occurs in
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|