diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 15:48:03 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 15:48:03 -0700 |
commit | 899ad580fe93c6d2a9f364fb0329ef2c259ccd1d (patch) | |
tree | 29727a0a8543b45b58e44cdd111f7890d6cec0a9 /arch/ia64/xen/xensetup.S | |
parent | a425a638c858fd10370b573bde81df3ba500e271 (diff) | |
parent | 0692698cb7369ea1ce74f3f87f70baf5072f8a37 (diff) |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] xen_domu_defconfig: fix build issues/warnings
Diffstat (limited to 'arch/ia64/xen/xensetup.S')
-rw-r--r-- | arch/ia64/xen/xensetup.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ia64/xen/xensetup.S b/arch/ia64/xen/xensetup.S index 28fed1fcc07..aff8346ea19 100644 --- a/arch/ia64/xen/xensetup.S +++ b/arch/ia64/xen/xensetup.S @@ -54,8 +54,6 @@ END(startup_xen) #define isBP p3 // are we the Bootstrap Processor? - .text - GLOBAL_ENTRY(xen_setup_hook) mov r8=XEN_PV_DOMAIN_ASM (isBP) movl r9=xen_domain_type;; |