diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-30 13:04:23 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-30 13:04:56 -0500 |
| commit | 3e93093ecd0c144e86a86cc1f165221b6cd3e7fb (patch) | |
| tree | 0d6dffb90985bd90fd0ca43076a629f12e277096 /arch/x86/kernel/entry_32.S | |
| parent | 43243322139194c2fea606095f82498e07536c27 (diff) | |
| parent | da660b4a3b15caea9c198c4f26d1cf7023df92fc (diff) | |
Merge tag 'vexpress/drivers-for-3.9' of git://git.linaro.org/people/pawelmoll/linux into next/drivers
From Pawel Moll:
Versatile Express related driver updates for 3.9:
* Move sp810 header to a more generic location,
mainly to share it with arm64
* tag 'vexpress/drivers-for-3.9' of git://git.linaro.org/people/pawelmoll/linux:
arm: Move sp810.h to include/linux/amba/
+ Linux 3.8-rc5
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/x86/kernel/entry_32.S')
| -rw-r--r-- | arch/x86/kernel/entry_32.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S index ff84d5469d77..6ed91d9980e2 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S | |||
| @@ -1065,7 +1065,6 @@ ENTRY(xen_failsafe_callback) | |||
| 1065 | lea 16(%esp),%esp | 1065 | lea 16(%esp),%esp |
| 1066 | CFI_ADJUST_CFA_OFFSET -16 | 1066 | CFI_ADJUST_CFA_OFFSET -16 |
| 1067 | jz 5f | 1067 | jz 5f |
| 1068 | addl $16,%esp | ||
| 1069 | jmp iret_exc | 1068 | jmp iret_exc |
| 1070 | 5: pushl_cfi $-1 /* orig_ax = -1 => not a system call */ | 1069 | 5: pushl_cfi $-1 /* orig_ax = -1 => not a system call */ |
| 1071 | SAVE_ALL | 1070 | SAVE_ALL |