diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
| commit | 577f99c1d08cf9cbdafd4e858dd13ff04d855090 (patch) | |
| tree | 0f726bbda9b18d311d4c95198bbd96cb7ac01db0 /include/asm-x86/lguest.h | |
| parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
| parent | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c
Diffstat (limited to 'include/asm-x86/lguest.h')
| -rw-r--r-- | include/asm-x86/lguest.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/asm-x86/lguest.h b/include/asm-x86/lguest.h index 4d9367b72976..9b17571e9bc3 100644 --- a/include/asm-x86/lguest.h +++ b/include/asm-x86/lguest.h | |||
| @@ -23,6 +23,17 @@ | |||
| 23 | /* Found in switcher.S */ | 23 | /* Found in switcher.S */ |
| 24 | extern unsigned long default_idt_entries[]; | 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 | struct lguest_regs | 37 | struct lguest_regs |
| 27 | { | 38 | { |
| 28 | /* Manually saved part. */ | 39 | /* Manually saved part. */ |