diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-06-15 21:08:07 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-06-15 21:08:07 -0400 |
| commit | 7eef4091a653c243a87e5375c54504cc03bec4d8 (patch) | |
| tree | f65b77f830b2c8f7d014512badfef5df0d591ee9 /arch/ia64/xen/xensetup.S | |
| parent | 0a93a47f042c459f0f46942c3a920e3c81878031 (diff) | |
| parent | 07a2039b8eb0af4ff464efd3dfd95de5c02648c6 (diff) | |
Merge commit 'v2.6.30' into for-2.6.31
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 28fed1fcc079..aff8346ea193 100644 --- a/arch/ia64/xen/xensetup.S +++ b/arch/ia64/xen/xensetup.S | |||
| @@ -54,8 +54,6 @@ END(startup_xen) | |||
| 54 | 54 | ||
| 55 | #define isBP p3 // are we the Bootstrap Processor? | 55 | #define isBP p3 // are we the Bootstrap Processor? |
| 56 | 56 | ||
| 57 | .text | ||
| 58 | |||
| 59 | GLOBAL_ENTRY(xen_setup_hook) | 57 | GLOBAL_ENTRY(xen_setup_hook) |
| 60 | mov r8=XEN_PV_DOMAIN_ASM | 58 | mov r8=XEN_PV_DOMAIN_ASM |
| 61 | (isBP) movl r9=xen_domain_type;; | 59 | (isBP) movl r9=xen_domain_type;; |