diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-17 12:21:41 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-17 12:21:41 -0400 |
| commit | 813400060fe2824163cabd9afed4e476e7ce282e (patch) | |
| tree | 22141d6e937991761345a63dd80125be13eb50ea /arch/x86/boot/bioscall.S | |
| parent | 1bf7b31efa0c322d93cb3f772cd9bc743e8bb42d (diff) | |
| parent | fe955e5c793aab398794be4c5ede172d48446c4a (diff) | |
Merge branch 'x86/urgent' into x86/mce3
Conflicts:
arch/x86/kernel/cpu/mcheck/mce_intel.c
Merge reason: merge with an urgent-branch MCE fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/boot/bioscall.S')
| -rw-r--r-- | arch/x86/boot/bioscall.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/bioscall.S b/arch/x86/boot/bioscall.S index 507793739ea5..1dfbf64e52a2 100644 --- a/arch/x86/boot/bioscall.S +++ b/arch/x86/boot/bioscall.S | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | * touching registers they shouldn't be. | 13 | * touching registers they shouldn't be. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | .code16 | 16 | .code16gcc |
| 17 | .text | 17 | .text |
| 18 | .globl intcall | 18 | .globl intcall |
| 19 | .type intcall, @function | 19 | .type intcall, @function |