diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:19 -0400 |
| commit | 646b1db4956ba8bf748b835b5eba211133d91c2e (patch) | |
| tree | 061166d873d9da9cf83044a7593ad111787076c5 /arch/ia64/xen | |
| parent | 0f2c3de2ba110626515234d5d584fb1b0c0749a2 (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into perf/core
Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.
Diffstat (limited to 'arch/ia64/xen')
| -rw-r--r-- | arch/ia64/xen/gate-data.S | 2 | ||||
| -rw-r--r-- | arch/ia64/xen/xensetup.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/xen/gate-data.S b/arch/ia64/xen/gate-data.S index 7d4830afc91d..6f95b6b32a4e 100644 --- a/arch/ia64/xen/gate-data.S +++ b/arch/ia64/xen/gate-data.S | |||
| @@ -1,3 +1,3 @@ | |||
| 1 | .section .data.gate.xen, "aw" | 1 | .section .data..gate.xen, "aw" |
| 2 | 2 | ||
| 3 | .incbin "arch/ia64/xen/gate.so" | 3 | .incbin "arch/ia64/xen/gate.so" |
diff --git a/arch/ia64/xen/xensetup.S b/arch/ia64/xen/xensetup.S index aff8346ea193..b820ed02ab9f 100644 --- a/arch/ia64/xen/xensetup.S +++ b/arch/ia64/xen/xensetup.S | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 15 | #include <xen/interface/elfnote.h> | 15 | #include <xen/interface/elfnote.h> |
| 16 | 16 | ||
| 17 | .section .data.read_mostly | 17 | .section .data..read_mostly |
| 18 | .align 8 | 18 | .align 8 |
| 19 | .global xen_domain_type | 19 | .global xen_domain_type |
| 20 | xen_domain_type: | 20 | xen_domain_type: |