Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit cbc34973709eb41b369c304c075cf2069f847012

Authored by Harvey Harrison
Committed by Ingo Molnar
1 parent bfa274e243
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

lguest: include function prototypes 

Added a declaration to asm-x86/lguest.h and moved the extern arrays there
as well.  As an alternative to including asm/lguest.h directly, an
include could be put in linux/lguest.h

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: "rusty@rustcorp.com.au" <rusty@rustcorp.com.au>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Showing 2 changed files with 12 additions and 9 deletions Side-by-side Diff

arch/x86/lguest/boot.c
Diff comments   View file @ cbc3497
... ... @@ -57,6 +57,7 @@
57 57 #include <linux/lguest_launcher.h>
58 58 #include <linux/virtio_console.h>
59 59 #include <linux/pm.h>
  60 +#include <asm/lguest.h>
60 61 #include <asm/paravirt.h>
61 62 #include <asm/param.h>
62 63 #include <asm/page.h>
... ... @@ -74,15 +75,6 @@
74 75 * The Guest in our tale is a simple creature: identical to the Host but
75 76 * behaving in simplified but equivalent ways. In particular, the Guest is the
76 77 * same kernel as the Host (or at least, built from the same source code). :*/
77   -
78   -/* Declarations for definitions in lguest_guest.S */
79   -extern char lguest_noirq_start[], lguest_noirq_end[];
80   -extern const char lgstart_cli[], lgend_cli[];
81   -extern const char lgstart_sti[], lgend_sti[];
82   -extern const char lgstart_popf[], lgend_popf[];
83   -extern const char lgstart_pushf[], lgend_pushf[];
84   -extern const char lgstart_iret[], lgend_iret[];
85   -extern void lguest_iret(void);
86 78  
87 79 struct lguest_data lguest_data = {
88 80 .hcall_status = { [0 ... LHCALL_RING_SIZE-1] = 0xFF },
include/asm-x86/lguest.h
Diff comments   View file @ cbc3497
... ... @@ -23,6 +23,17 @@
23 23 /* Found in switcher.S */
24 24 extern unsigned long default_idt_entries[];
25 25  
  26 +/* Declarations for definitions in lguest_guest.S */
  27 +extern char lguest_noirq_start[], lguest_noirq_end[];
  28 +extern const char lgstart_cli[], lgend_cli[];
  29 +extern const char lgstart_sti[], lgend_sti[];
  30 +extern const char lgstart_popf[], lgend_popf[];
  31 +extern const char lgstart_pushf[], lgend_pushf[];
  32 +extern const char lgstart_iret[], lgend_iret[];
  33 +
  34 +extern void lguest_iret(void);
  35 +extern void lguest_init(void);
  36 +
26 37 struct lguest_regs
27 38 {
28 39 /* Manually saved part. */